aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
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
parent846d4d136db2136c4b2379e1eedcfbb18ce070a8 (diff)
document --filter and remove git_load_dirs referenzes
-rw-r--r--docs/chapters/import.sgml6
-rw-r--r--docs/manpages/git-import-dsc.sgml8
-rw-r--r--docs/manpages/git-import-orig.sgml18
3 files changed, 27 insertions, 5 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>
</para>
<para>
If you expect a merge conflict you can delay the merge to
diff --git a/docs/manpages/git-import-dsc.sgml b/docs/manpages/git-import-dsc.sgml
index 1af9d77..df783d3 100644
--- a/docs/manpages/git-import-dsc.sgml
+++ b/docs/manpages/git-import-dsc.sgml
@@ -27,6 +27,7 @@
<arg><option>--keyid=</option><replaceable>gpg-keyid</replaceable></arg>
<arg><option>--debian-tag=</option><replaceable>tag-format</replaceable></arg>
<arg><option>--upstream-tag=</option><replaceable>tag-format</replaceable></arg>
+ <arg><option>--filter=</option><replaceable>pattern</replaceable></arg>
<arg choice="plain"><replaceable>debian-source.dsc</replaceable></arg>
</cmdsynopsis>
</refsynopsisdiv>
@@ -86,6 +87,13 @@
<para>use this tag format when tagging upstream versions</para>
</listitem>
</varlistentry>
+ <varlistentry>
+ <term><option>--filter=</option><replaceable>filter</replaceable>
+ </term>
+ <listitem>
+ <para>filter out these files during import</para>
+ </listitem>
+ </varlistentry>
</variablelist>
</refsect1>
<refsect1>
diff --git a/docs/manpages/git-import-orig.sgml b/docs/manpages/git-import-orig.sgml
index a28047e..8553561 100644
--- a/docs/manpages/git-import-orig.sgml
+++ b/docs/manpages/git-import-orig.sgml
@@ -30,6 +30,7 @@
<arg><option>--sign-tags</option></arg>
<arg><option>--keyid=</option><replaceable>gpg-keyid</replaceable></arg>
<arg><option>--upstream-tag=</option><replaceable>tag-format</replaceable></arg>
+ <arg><option>--filter=</option><replaceable>pattern</replaceable></arg>
<arg choice="plain"><replaceable>upstream-source</replaceable></arg>
</cmdsynopsis>
</refsynopsisdiv>
@@ -38,14 +39,16 @@
<para>
&git-import-orig; imports <replaceable>upstream-source</replaceable> into
the &git; repository. <replaceable>upstream-source</replaceable> can either
- be a gzip or bzip2 compressed tar archive or an alreay unpacked source
+ be a gzip or bzip2 compressed tar archive or an already unpacked source
tree. If it is already of the form
<replaceable>package-name_version.orig.tar.gz</replaceable>, the version
information is read from the tarball's filename otherwise it can be
given on the command line via <option>--upstream-version</option>.
-
- Upon import <command>git_load_dirs</command> is being used to detect file
- renames and removals.
+ </para>
+
+ <para>The sources are placed on the upstream branch (default:
+ <replaceable>upstream</replaceable>), tagged and merged onto the debian
+ branch (default: <replaceable>master</replaceable>).
</para>
</refsect1>
<refsect1>
@@ -111,6 +114,13 @@
<para>use this tag format when tagging upstream versions</para>
</listitem>
</varlistentry>
+ <varlistentry>
+ <term><option>--filter=</option><replaceable>filter</replaceable>
+ </term>
+ <listitem>
+ <para>filter out these files during import</para>
+ </listitem>
+ </varlistentry>
</variablelist>
</refsect1>
<refsect1>