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
(parent:
61ac8a0
)
dgit-maint-merge(7): Missing -o
author
Sean Whitton
<spwhitton@spwhitton.name>
Mon, 19 Dec 2016 09:13:11 +0000
(09:13 +0000)
committer
Sean Whitton
<spwhitton@spwhitton.name>
Mon, 19 Dec 2016 09:13:11 +0000
(09:13 +0000)
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
dgit-maint-merge.7.pod
patch
|
blob
|
history
diff --git
a/dgit-maint-merge.7.pod
b/dgit-maint-merge.7.pod
index 8794d1d0539287fcb527ea4599ccfb622d9deabc..240673aebd86af8b90deb01fb847dd92521b17ae 100644
(file)
--- a/
dgit-maint-merge.7.pod
+++ b/
dgit-maint-merge.7.pod
@@
-261,7
+261,7
@@
Once you're satisfied with what will be merged, update your package:
=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