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:
ce5871d
)
dgit-maint-merge(7): Do not cross-reference nonexistent dgit-maint-rebase(7)
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Mon, 31 Oct 2016 00:31:02 +0000
(
00:31
+0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Mon, 31 Oct 2016 00:31:02 +0000
(
00:31
+0000)
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 f785af7ad97282fb47f14c5e70441fc0ea903799..03ccdfe84acb0e2e4310f455d5307293d7e8bd26 100644
(file)
--- 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