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): Missing -o
[dgit.git]
/
dgit-maint-merge.7.pod
diff --git
a/dgit-maint-merge.7.pod
b/dgit-maint-merge.7.pod
index 03ccdfe84acb0e2e4310f455d5307293d7e8bd26..240673aebd86af8b90deb01fb847dd92521b17ae 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.
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
=item
Maintaining convenient and powerful git workflows takes priority over
@@
-264,7
+261,7
@@
Once you're satisfied with what will be merged, update your package:
=over 4
=over 4
- % git archive ../foo_1.2.3.orig.tar.xz 1.2.3
+ % git archive
-o
../foo_1.2.3.orig.tar.xz 1.2.3
% git merge 1.2.3
% dch -v1.2.3-1 New upstream release.
% git add debian/changelog && git commit -m changelog
% git merge 1.2.3
% dch -v1.2.3-1 New upstream release.
% git add debian/changelog && git commit -m changelog