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 <ijackson@chiark.greenend.org.uk>

diff --git a/git-debrebase b/git-debrebase
index 369319067544b038537df7749d77d5684448addd..2e027f5f714bbcd7304cb95801eced0f88edf34e 100755 (executable)
--- 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 d39ad9484986fb022e98e735a030d91f6e136063..751529e1a042770af75e8deda5f67f74cf151a73 100644 (file)
--- 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.