path: root/git-debrebase.5.pod
diff options
authorIan Jackson <>2018-08-19 20:30:32 +0100
committerIan Jackson <>2018-08-19 21:00:31 +0100
commit5caa54e103693bd97c41251d803df83d7ab0c155 (patch)
tree20446825e82829036a5a48635dff907c196aa247 /git-debrebase.5.pod
parent6392501bee3f167ca61ba648413190ac83cf4257 (diff)
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 <>
Diffstat (limited to 'git-debrebase.5.pod')
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.