aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2017-06-26 12:23:31 +0200
committerGuido Günther <agx@sigxcpu.org>2017-06-26 12:31:46 +0200
commit7fd6ba16a56dfa68dd80244f0358a494b1ad1169 (patch)
treeaabcf8f952ce51e0563e284a7c1d21238ca1dc57
parentf1e9d857248164b8b3cd31929870f97035e91e2b (diff)
docs: merge histories when importing
This is only necessary for non 3.0 (quilt) packages when not using merge-mode=auto with "gbp import-orig". Thanks: Sean Whitton Closes: #864881
-rw-r--r--docs/chapters/import.sgml2
1 files changed, 2 insertions, 0 deletions
diff --git a/docs/chapters/import.sgml b/docs/chapters/import.sgml
index 0dfff40..fa445a2 100644
--- a/docs/chapters/import.sgml
+++ b/docs/chapters/import.sgml
@@ -198,6 +198,8 @@ EOF
<command>git rm</command> <option>-rf</option> <replaceable>.</replaceable>
<command>git commit</command> <option>--allow-empty</option> <option>-m</option> <replaceable>'Initial upstream branch.'</replaceable>
<command>git checkout</command> <option>-f</option> <replaceable>master</replaceable>
+ # When not using 3.0 (quilt) with the default --merge-mode=auto
+ <command>git merge</command> <option>--allow-unrelated-histories</option> <replaceable>upstream</replaceable>
</programlisting>
With Git versions lower than 1.7.2.3, the commands are slightly more complicated:
<programlisting>