X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase.5.pod;h=751529e1a042770af75e8deda5f67f74cf151a73;hp=d39ad9484986fb022e98e735a030d91f6e136063;hb=52b97bd1b16a5db0b3b58e4864b5fdd6fc5e2689;hpb=0057ec1d2d864bbd40a5fcc32a5edeeb2bc90b4e 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.