summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dgit-maint-merge.7.pod3
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
+
=back
gbp-import-orig(1) requires a pre-existing upstream branch: