X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase.5.pod;h=5cfa3761080eb5c6accffa98cfd6682b72cbffa0;hp=af9b91a03989d31e8c6dad64261686b3f73f9927;hb=6b3cdcf0d595efd96bc8c4220df87f7fd5aaef76;hpb=2473428adbc11e7bcd557b48fea887203cd48446 diff --git a/git-debrebase.5.pod b/git-debrebase.5.pod index af9b91a0..5cfa3761 100644 --- a/git-debrebase.5.pod +++ b/git-debrebase.5.pod @@ -123,7 +123,7 @@ See L. -/- pseudomerge; contents are identical to / parent lower on diagram. - % dgit-generated commit of debian/patches. + % dgit- or git-debrebase- generated commit of debian/patches. `3.0 (quilt)' only; generally dropped by git-debrebase. * Maintainer's HEAD was here while they were editing, @@ -501,6 +501,7 @@ The full set of annotations is: [git-debrebase upstream-combine . PIECE[ PIECE...]: new upstream] [git-debrebase anchor: new upstream NEW-UPSTREAM-VERSION, merge] [git-debrebase: new upstream NEW-UPSTREAM-VERSION, changelog] + [git-debrebase: export and commit patches] [git-debrebase convert-from-gbp: drop patches] [git-debrebase anchor: declare upstream]