summaryrefslogtreecommitdiff
path: root/docs/chapters/import.sgml
diff options
context:
space:
mode:
authorGuido Guenther <agx@sigxcpu.org>2008-02-08 16:36:03 +0100
committerGuido Guenther <agx@sigxcpu.org>2008-02-08 16:36:03 +0100
commit70aad7d304c3ba42557c4fe06d70b7eedce8365f (patch)
treea23b468e25e0c84aa17c6da0a388a288100ff543 /docs/chapters/import.sgml
parent76ba9da377b347dbbb07110e7bb8953d4b68247c (diff)
document default tag formats (Closes: #464100)
Diffstat (limited to 'docs/chapters/import.sgml')
-rw-r--r--docs/chapters/import.sgml6
1 files changed, 4 insertions, 2 deletions
diff --git a/docs/chapters/import.sgml b/docs/chapters/import.sgml
index 1bbca3f..7ff450c 100644
--- a/docs/chapters/import.sgml
+++ b/docs/chapters/import.sgml
@@ -27,8 +27,10 @@
&git-import-orig; <filename>/path/to/package_0.2.tar.bz2</filename>
&git-import-orig; <filename>/path/to/package-0.2/</filename>
</screen>
- This puts the upstream souces onto the <option>upstream-branch</option>.
- The result of this is then merged onto the <option>debian-branch</option>
+ This puts the upstream souces onto the <option>upstream-branch</option> and
+ tags them accordingly (the default tag format is
+ <replaceable>upstream/&lt;version&gt;</replaceable>).
+ The result is then merged onto the <option>debian-branch</option>
and a new &debian; changelog entry is created. You can again specify
different branch names via the <option>--upstream-branch</option> and
<option>--debian-branch</option> options. You can also filter out content