summaryrefslogtreecommitdiff
path: root/git-debrebase.5.pod
diff options
context:
space:
mode:
Diffstat (limited to 'git-debrebase.5.pod')
-rw-r--r--git-debrebase.5.pod2
1 files changed, 2 insertions, 0 deletions
diff --git a/git-debrebase.5.pod b/git-debrebase.5.pod
index d39ad94..751529e 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.