From 8f086237a8e78c4bd7d018f70818092eb27a5440 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Wed, 24 Jul 2019 20:08:23 +0100 Subject: [PATCH] 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 --- dgit-maint-debrebase.7.pod | 8 ++++---- dgit-maint-merge.7.pod | 7 ++++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dgit-maint-debrebase.7.pod b/dgit-maint-debrebase.7.pod index d07a296f..77b4eca0 100644 --- a/dgit-maint-debrebase.7.pod +++ b/dgit-maint-debrebase.7.pod @@ -188,7 +188,7 @@ Now create I: 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 diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod index 3919fa8b..51b6a69d 100644 --- a/dgit-maint-merge.7.pod +++ b/dgit-maint-merge.7.pod @@ -174,6 +174,7 @@ Now create I: [import-orig] merge-mode = merge + merge = False =back @@ -193,7 +194,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 @@ -381,7 +382,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 @@ -389,7 +390,7 @@ or if you have a working watch file =over 4 - % gbp import-orig --no-merge --uscan + % gbp import-orig --uscan =back -- 2.30.2