X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit-maint-merge.7.pod;h=03ccdfe84acb0e2e4310f455d5307293d7e8bd26;hp=f785af7ad97282fb47f14c5e70441fc0ea903799;hb=3bdf06f4ea6d3735c73c12903e3ac7ce8447f61a;hpb=52046de403b82e8ef608e62f4cb7ec8c38b10c56

diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod
index f785af7a..03ccdfe8 100644
--- 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