X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=git-debrebase.5.pod;h=d55033b300814470939ce6135a1209f1991c8cb5;hb=810e4238be5d20dcb6fed85ab247180fddd99076;hp=d23c6b21b6787b87fcc2fe9cba503f19b47f3bda;hpb=90c358cebcebc5facf68900ce7f1bbc263e71f1e;p=dgit.git diff --git a/git-debrebase.5.pod b/git-debrebase.5.pod index d23c6b21..d55033b3 100644 --- a/git-debrebase.5.pod +++ b/git-debrebase.5.pod @@ -391,7 +391,7 @@ general merges on any of the relevant branches. For this reason the tools will try to help the user avoid divergence of the interchange branch. -See dgit-maint-rebase(7) +See dgit-maint-debrebase(7) for a discussion of what kinds of behaviours should be be avoided because @@ -562,7 +562,7 @@ paying no attention to PROSE. The full set of annotations is: [git-debrebase split: mixed commit, debian part] [git-debrebase split: mixed commit, upstream-part] - [git-debrebase onvert dgit import: debian changes] + [git-debrebase convert dgit import: debian changes] [git-debrebase anchor: convert dgit import, upstream changes] [git-debrebase upstream-combine . PIECE[ PIECE...]: new upstream]