diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-10-31 01:01:53 +0000 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-10-31 01:01:53 +0000 |
| commit | 570229251d8c8c7fe65fe2117556d9b9e673306b (patch) | |
| tree | e107afc4c82f85845e93b4b221ab1f3744ec85e6 /dgit-maint-merge.7.pod | |
| parent | 3bdf06f4ea6d3735c73c12903e3ac7ce8447f61a (diff) | |
dgit-maint-merge(7): Drop subpoint about "nonlinear histories"
Suggested by Sean
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.pod | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod index 03ccdfe..8794d1d 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 |