path: root/docs/chapters
diff options
authorGuido Guenther <agx@sigxcpu.org>2007-05-29 08:28:19 +0200
committerGuido Guenther <agx@bogon.sigxcpu.org>2007-05-29 08:28:19 +0200
commitadab5241b90dcd33b9de8f8b2f9fefdaf7daa3d6 (patch)
tree60cd604e4d3c3e01b7bd1474bc4fa7745962393b /docs/chapters
parent846d4d136db2136c4b2379e1eedcfbb18ce070a8 (diff)
document --filter and remove git_load_dirs referenzes
Diffstat (limited to 'docs/chapters')
1 files changed, 5 insertions, 1 deletions
diff --git a/docs/chapters/import.sgml b/docs/chapters/import.sgml
index 1420999..a9fd5e1 100644
--- a/docs/chapters/import.sgml
+++ b/docs/chapters/import.sgml
@@ -28,7 +28,11 @@
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.
+ <option>--debian-branch</option> options. You can also filter out content
+ you don't want imported:
+ <screen>
+&git-import-orig; --filter='CVS/*' /path/to/package_0.2.orig.tar.gz
+ </screen>
If you expect a merge conflict you can delay the merge to