chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
dgit-maint-merge(7): Configure --merge-mode for gbp-import-orig(1)
[dgit.git]
/
dgit-maint-merge.7.pod
diff --git
a/dgit-maint-merge.7.pod
b/dgit-maint-merge.7.pod
index 995fe8b7e28b759aab09102ff98b297c98796607..fe48609ffaea1ff1c6fb4a420bd3e1960ef6e6f4 100644
(file)
--- 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: