chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
3bdf06f
)
dgit-maint-merge(7): Drop subpoint about "nonlinear histories"
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Mon, 31 Oct 2016 01:01:53 +0000
(
01:01
+0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Mon, 31 Oct 2016 01:01:53 +0000
(
01:01
+0000)
Suggested by Sean
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
dgit-maint-merge.7.pod
patch
|
blob
|
history
diff --git
a/dgit-maint-merge.7.pod
b/dgit-maint-merge.7.pod
index 03ccdfe84acb0e2e4310f455d5307293d7e8bd26..8794d1d0539287fcb527ea4599ccfb622d9deabc 100644
(file)
--- 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