From f7678947dc803478e111d283c4b3508a0e363f37 Mon Sep 17 00:00:00 2001
From: Guido Guenther <agx@sigxcpu.org>
Date: Sat, 23 Feb 2008 23:47:15 +0100
Subject: update --filter and filter = [ ... ] options in gbp.conf

---
 docs/manpages/git-import-dsc.sgml  | 2 +-
 docs/manpages/git-import-orig.sgml | 2 +-
 gbp.conf                           | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/manpages/git-import-dsc.sgml b/docs/manpages/git-import-dsc.sgml
index 1fb8ec4..6fb2cec 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 29a7dcd..d1034eb 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 0ae42b9..0508209 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]
-- 
cgit v1.2.3