summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGuido Guenther <agx@sigxcpu.org>2008-02-23 23:47:15 +0100
committerGuido Guenther <agx@sigxcpu.org>2008-02-23 23:47:15 +0100
commitf7678947dc803478e111d283c4b3508a0e363f37 (patch)
treedbd2c103d68f7b0887e05e5e77352ff61179e5a4
parent4f4af28050d11d21300b59917893cc48f87fa562 (diff)
update --filter and filter = [ ... ] options in gbp.conf
-rw-r--r--docs/manpages/git-import-dsc.sgml2
-rw-r--r--docs/manpages/git-import-orig.sgml2
-rw-r--r--gbp.conf2
3 files changed, 4 insertions, 2 deletions
diff --git a/docs/manpages/git-import-dsc.sgml b/docs/manpages/git-import-dsc.sgml
index 1fb8ec4c..6fb2cecd 100644
--- a/docs/manpages/git-import-dsc.sgml
+++ b/docs/manpages/git-import-dsc.sgml
@@ -103,7 +103,7 @@
<term><option>--filter=</option><replaceable>filter</replaceable>
</term>
<listitem>
- <para>filter out these files during import</para>
+ <para>filter out these files during import. Can be given multiple times.</para>
</listitem>
</varlistentry>
<varlistentry>
diff --git a/docs/manpages/git-import-orig.sgml b/docs/manpages/git-import-orig.sgml
index 29a7dcdf..d1034eb5 100644
--- a/docs/manpages/git-import-orig.sgml
+++ b/docs/manpages/git-import-orig.sgml
@@ -127,7 +127,7 @@
<term><option>--filter=</option><replaceable>filter</replaceable>
</term>
<listitem>
- <para>filter out these files during import</para>
+ <para>filter out these files during import. Can be given multiple times.</para>
</listitem>
</varlistentry>
<varlistentry>
diff --git a/gbp.conf b/gbp.conf
index 0ae42b9b..05082097 100644
--- a/gbp.conf
+++ b/gbp.conf
@@ -32,10 +32,12 @@
[git-import-orig]
#upstream-branch = newupstream
#debian-branch = dfsgclean
+#filter = .svn
# Options only affecting git-import-dsc
[git-import-dsc]
#upstream-branch = svn-upstream
+#filter = [ 'CVS', '.cvsignore' ]
# Options only affecting git-dch
[git-dch]