From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 31 Oct 2016 01:01:53 +0000 (+0000)
Subject: dgit-maint-merge(7): Drop subpoint about "nonlinear histories"
X-Git-Tag: archive/debian/2.9~4
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=570229251d8c8c7fe65fe2117556d9b9e673306b;ds=sidebyside

dgit-maint-merge(7): Drop subpoint about "nonlinear histories"

Suggested by Sean

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod
index 03ccdfe8..8794d1d0 100644
--- a/dgit-maint-merge.7.pod
+++ b/dgit-maint-merge.7.pod
@@ -16,9 +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-gbp(7)
-for a workflow based on git-buildpackage, or roll your own.
-
 =item
 
 Maintaining convenient and powerful git workflows takes priority over