chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
d-m-{merge,debrebase}(7): Set 'merge' in gbp.conf
[dgit.git]
/
dgit-maint-merge.7.pod
diff --git
a/dgit-maint-merge.7.pod
b/dgit-maint-merge.7.pod
index 3919fa8b5b73f23d4f29a0276dd3c92ea6f6ac78..51b6a69dbf4ebc29df23251ef8024b3818d06e71 100644
(file)
--- a/
dgit-maint-merge.7.pod
+++ b/
dgit-maint-merge.7.pod
@@
-174,6
+174,7
@@
Now create I<debian/gbp.conf>:
[import-orig]
merge-mode = merge
[import-orig]
merge-mode = merge
+ merge = False
=back
=back
@@
-193,7
+194,7
@@
Then we can import the upstream version:
=over 4
=over 4
- % gbp import-orig --merge-mode=replace ../foo_1.2.2.orig.tar.xz
+ % gbp import-orig --merge
--merge
-mode=replace ../foo_1.2.2.orig.tar.xz
=back
=back
@@
-381,7
+382,7
@@
Then, either
=over 4
=over 4
- % gbp import-orig
--no-merge
../foo_1.2.3.orig.tar.xz
+ % gbp import-orig ../foo_1.2.3.orig.tar.xz
=back
=back
@@
-389,7
+390,7
@@
or if you have a working watch file
=over 4
=over 4
- % gbp import-orig --
no-merge --
uscan
+ % gbp import-orig --uscan
=back
=back