chiark / gitweb /
dgit-maint-merge(7): Do not cross-reference nonexistent dgit-maint-rebase(7)
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Mon, 31 Oct 2016 00:31:02 +0000 (00:31 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Mon, 31 Oct 2016 00:31:02 +0000 (00:31 +0000)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
dgit-maint-merge.7.pod

index f785af7..03ccdfe 100644 (file)
@@ -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