From 5caa54e103693bd97c41251d803df83d7ab0c155 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 19 Aug 2018 20:30:32 +0100 Subject: [PATCH] git-debrebase: Document merged-breakwater metadata tag This is generated only by the experimental merge machinery and is subject to possible future change. Signed-off-by: Ian Jackson --- git-debrebase | 1 - git-debrebase.5.pod | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/git-debrebase b/git-debrebase index 36931906..2e027f5f 100755 --- a/git-debrebase +++ b/git-debrebase @@ -978,7 +978,6 @@ sub classify ($) { if (@p == 2 and $r->{Msg} =~ m{^\[git-debrebase merged-breakwater.*\]$}m) { - # xxx ^ metadata tag needs adding to (5) return $classify->("MergedBreakwaters"); } if ($r->{Msg} =~ m{^\[(git-debrebase|dgit)[: ].*\]$}m) { diff --git a/git-debrebase.5.pod b/git-debrebase.5.pod index d39ad948..751529e1 100644 --- a/git-debrebase.5.pod +++ b/git-debrebase.5.pod @@ -556,6 +556,8 @@ The full set of annotations is: [git-debrebase anchor: declare upstream] [git-debrebase pseudomerge: stitch] + [git-debrebase merged-breakwater: constructed from vanilla merge] + [git-debrebase convert-to-gbp: commit patches] Only anchor merges have the C<[git-debrebase anchor: ...]> tag. -- 2.30.2