path: root/dgit-maint-merge.7.pod
diff options
authorSean Whitton <>2017-11-25 16:56:14 -0700
committerIan Jackson <>2018-01-06 01:23:54 +0000
commitd6291b24a8338eed8628a9da1eab2810652630e8 (patch)
treee41a6f5a5ff7c0868d599d0ea86fdec46918db15 /dgit-maint-merge.7.pod
parent303f60ed281bee140e59a11b043267d4ffc1a550 (diff)
dgit-maint-merge(7): Configure --merge-mode for gbp-import-orig(1)
For 3.0 (quilt) source packages, gbp-import-orig(1) defaults to --merge-mode=replace, which does the wrong thing for patches-applied repositories (see gbp-import-orig(1)). Note that we do override this when importing the first upstream version. This is needed because git-merge(1) will refuse to merge unrelated histories. Thanks to Johannes Schauer for reporting the problem. Signed-off-by: Sean Whitton <>
Diffstat (limited to 'dgit-maint-merge.7.pod')
1 files changed, 3 insertions, 0 deletions
diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod
index 995fe8b..fe48609 100644
--- a/dgit-maint-merge.7.pod
+++ b/dgit-maint-merge.7.pod
@@ -146,6 +146,9 @@ Now create I<debian/gbp.conf>:
pristine-tar = False
pristine-tar-commit = False
+ [import-orig]
+ merge-mode = merge
gbp-import-orig(1) requires a pre-existing upstream branch: