summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames McCoy <jamessan@debian.org>2020-04-10 08:28:16 -0400
committerJames McCoy <jamessan@debian.org>2020-04-10 08:29:21 -0400
commit1b2bdd04a05d504bd07f01bc1f72290dcde90a02 (patch)
treeb93ea694c99ee0a6edbfef450fe623204eb71cd9
parentc8565f9b9d8255660b1d43c387c8bc8080550997 (diff)
gbp.conf: Set merge = False for debrebase
Signed-off-by: James McCoy <jamessan@debian.org>
-rw-r--r--debian/gbp.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 02e9206..9cb745d 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -7,7 +7,7 @@ pristine-tar = False
pristine-tar-commit = False
[import-orig]
-merge-mode = merge
+merge = False
[pq]
patch-numbers = False