update --filter and filter = [ ... ] options in gbp.conf

diff --git a/docs/manpages/git-import-dsc.sgml b/docs/manpages/git-import-dsc.sgml
index 1fb8ec4c410b35550402e516e579cb5db36d779b..6fb2cecd2c1bffaa52d5bb5c2d2223c73a6464ca 100644 (file)
--- 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 29a7dcdfc68688de37cf908404cf5fd2ef3dbc56..d1034eb55aa97108fae726da47fdca1e15ed5356 100644 (file)
--- 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 0ae42b9be6c3080821468c17d3a00d87d31f7d3a..05082097afb1676cacdeda3fb26f19df0017e48e 100644 (file)
--- 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]