chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dgit-maint-merge(7): Do not cross-reference nonexistent dgit-maint-rebase(7)
[dgit.git]
/
dgit-maint-merge.7.pod
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.
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
=item