diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2019-07-24 20:08:23 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2020-02-02 16:46:43 +0000 |
| commit | 8f086237a8e78c4bd7d018f70818092eb27a5440 (patch) | |
| tree | b696600e705f7faea4a606eeb7e6f91c03cba260 /dgit-maint-debrebase.7.pod | |
| parent | 22c53928460b993bddadb72e8fd51dd916e29cfc (diff) | |
d-m-{merge,debrebase}(7): Set 'merge' in gbp.conf
This enables simplifying runes which are more frequently to be typed.
'merge-mode' no longer need be set since in the only case where the
manpages recommend allowing `gbp import-orig` to perform a merge, a
different merge mode is required (and specified in that rune).
This is part of #932954.
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Diffstat (limited to 'dgit-maint-debrebase.7.pod')
| -rw-r--r-- | dgit-maint-debrebase.7.pod | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/dgit-maint-debrebase.7.pod b/dgit-maint-debrebase.7.pod index d07a296..77b4eca 100644 --- a/dgit-maint-debrebase.7.pod +++ b/dgit-maint-debrebase.7.pod @@ -188,7 +188,7 @@ Now create I<debian/gbp.conf>: pristine-tar-commit = False [import-orig] - merge-mode = merge + merge = False =back @@ -208,7 +208,7 @@ Then we can import the upstream version: =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 @@ -372,7 +372,7 @@ Then, either =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 @@ -380,7 +380,7 @@ or if you have a working watch file =over 4 - % gbp import-orig --no-merge --uscan + % gbp import-orig --uscan =back |