summaryrefslogtreecommitdiff
path: root/dgit-maint-merge.7.pod
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2016-10-31 00:31:02 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2016-10-31 00:31:02 +0000
commit3bdf06f4ea6d3735c73c12903e3ac7ce8447f61a (patch)
treefc2359539a8ecdd2deba1943f49f8e07f404a145 /dgit-maint-merge.7.pod
parentce5871dd987f455743c6f856b6c2114dd60c87af (diff)
dgit-maint-merge(7): Do not cross-reference nonexistent dgit-maint-rebase(7)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit-maint-merge.7.pod')
-rw-r--r--dgit-maint-merge.7.pod3
1 files changed, 2 insertions, 1 deletions
diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod
index f785af7..03ccdfe 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