X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit-maint-merge.7.pod;h=8794d1d0539287fcb527ea4599ccfb622d9deabc;hp=2900492528a7adc8bee218aae58c05105fc0fed3;hb=e29b49fdc614b9a8dfd668dc42e40d87cd381df4;hpb=2af63c751d2683aa6249c821ec6ead0ffc32a05a

diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod
index 29004925..8794d1d0 100644
--- a/dgit-maint-merge.7.pod
+++ b/dgit-maint-merge.7.pod
@@ -16,8 +16,6 @@ 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).
-
 =item
 
 Maintaining convenient and powerful git workflows takes priority over
@@ -314,6 +312,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