diff options
Diffstat (limited to 'git-debrebase.5.pod')
| -rw-r--r-- | git-debrebase.5.pod | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-debrebase.5.pod b/git-debrebase.5.pod index d23c6b2..d55033b 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] |