From: Ian Jackson Date: Mon, 31 Oct 2016 00:31:02 +0000 (+0000) Subject: dgit-maint-merge(7): Do not cross-reference nonexistent dgit-maint-rebase(7) X-Git-Tag: archive/debian/2.9~5 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=3bdf06f4ea6d3735c73c12903e3ac7ce8447f61a dgit-maint-merge(7): Do not cross-reference nonexistent dgit-maint-rebase(7) Signed-off-by: Ian Jackson --- 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