summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/chapters/import.sgml9
1 files changed, 4 insertions, 5 deletions
diff --git a/docs/chapters/import.sgml b/docs/chapters/import.sgml
index a9fd5e1..30718f3 100644
--- a/docs/chapters/import.sgml
+++ b/docs/chapters/import.sgml
@@ -23,11 +23,10 @@
&git-import-orig; /path/to/package_0.2.tar.bz2
&git-import-orig; /path/to/package-0.2/
</screen>
- This puts the upstream souces onto the <emphasis>upstream</emphasis> branch
- using &gitloaddirs; to handle file removals and renames. The result of
- this is then merged onto the <emphasis>master</emphasis> branch and a new
- changelog entry is created. You can again specify different branch names
- via the <option>--upstream-branch</option> and
+ This puts the upstream souces onto the <emphasis>upstream</emphasis> branch.
+ The result of this is then merged onto the <emphasis>master</emphasis>
+ branch and a new 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
you don't want imported:
<screen>