aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Plessy <plessy@debian.org>2009-11-03 22:04:36 +0900
committerGuido Günther <agx@sigxcpu.org>2009-11-05 20:51:08 +0100
commit509c1c3a1e58f3484317e578138d88ff6e56cd06 (patch)
tree3cee367938928583e8e6d0b2988a7f0c5db6cdd8
parent9960f2415c8332a594aa6f4d94d6f7763f5650b4 (diff)
Stefano Zacchiroli’s workaround for creating empty upstream branches.
(See ‘http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=471560’)
-rw-r--r--docs/chapters/import.sgml11
1 files changed, 11 insertions, 0 deletions
diff --git a/docs/chapters/import.sgml b/docs/chapters/import.sgml
index 521cc2f..429f9f1 100644
--- a/docs/chapters/import.sgml
+++ b/docs/chapters/import.sgml
@@ -130,6 +130,17 @@ EOF
url="http://git.or.cz/gitwiki/GraftPoint">grafts</ulink>. Afterwards you
can simply create a branch as explained above and &git-import-orig; will
work as expected.</para>
+ <para>Alternatively, if you are only importing source from original tarballs
+ (for instance when converting from a Subversion repository where the
+ mergeWithUpstream was set for svn-buildpackage), you can create an empty
+ upstream branch with the following commands:
+<screen>
+ git symbolic-ref HEAD refs/heads/upstream
+ git rm --cached -r .
+ git commit --allow-empty -m 'Initial upstream branch.'
+ git checkout -f master
+</screen>
+ </para>
</sect2>
</sect1>