dgit-maint-merge(7): Do not cross-reference nonexistent dgit-maint-rebase(7)

[dgit.git] / dgit-maint-merge.7.pod

diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod
index 2900492528a7adc8bee218aae58c05105fc0fed3..03ccdfe84acb0e2e4310f455d5307293d7e8bd26 100644 (file)
--- a/dgit-maint-merge.7.pod
+++ b/dgit-maint-merge.7.pod
@@ -16,7 +16,8 @@ Git histories should be the non-linear histories produced by
 git-merge(1), preserving all information about divergent development
 that was later brought together.
 
-If you prefer linear histories, see dgit-maint-rebase(7).
+If you prefer linear histories, see dgit-maint-gbp(7)
+for a workflow based on git-buildpackage, or roll your own.
 
 =item
 
@@ -314,6 +315,7 @@ Before merging the new 1.2.3+dfsg tag to master, you should first
 determine whether it would be legally dangerous for the non-free
 material to be publicly accessible in the git history on
 B<dgit-repos>.
+
 If it would be dangerous, there is a big problem;
 in this case please consult your archive administrators
 (for Debian this is the dgit administrator dgit-owner@debian.org