aboutsummaryrefslogtreecommitdiffhomepage
path: root/docs
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2008-10-22 15:59:13 +0200
committerGuido Guenther <agx@sigxcpu.org>2008-10-22 15:59:13 +0200
commit8b15994277805a3e3d6b1058f07113aef3c2e1ab (patch)
treede1ec08748586d48ad4cd629496e38870e36bb3b /docs
parentb6c407ba255d90eab6b849d84a6d4119c1a15b44 (diff)
allow for another config file $REPO/debian/gbp.conf
the advantage over $REPO/.gbp.conf is that one can keep everything packaging related below debian/. Thanks to Sean Finney. Closes: #502253
Diffstat (limited to 'docs')
-rw-r--r--docs/chapters/cfgfile.sgml4
-rw-r--r--docs/manpages/man.conffiles.sgml5
2 files changed, 9 insertions, 0 deletions
diff --git a/docs/chapters/cfgfile.sgml b/docs/chapters/cfgfile.sgml
index 6aa2f10d..3590a175 100644
--- a/docs/chapters/cfgfile.sgml
+++ b/docs/chapters/cfgfile.sgml
@@ -15,6 +15,10 @@
<listitem><para>per repository/branch configuration</para></listitem>
</varlistentry>
<varlistentry>
+ <term>debian/gbp.conf</term>
+ <listitem><para>per repository/branch configuration</para></listitem>
+ </varlistentry>
+ <varlistentry>
<term>.git/gbp.conf</term>
<listitem><para>per (local) repository configuration</para></listitem>
</varlistentry>
diff --git a/docs/manpages/man.conffiles.sgml b/docs/manpages/man.conffiles.sgml
index 29bff99e..c94253d8 100644
--- a/docs/manpages/man.conffiles.sgml
+++ b/docs/manpages/man.conffiles.sgml
@@ -16,6 +16,11 @@
repository</para></listitem>
</varlistentry>
<varlistentry>
+ <term>debian/gbp.conf</term>
+ <listitem><para>per branch configuration, can be published with the
+ repository</para></listitem>
+ </varlistentry>
+ <varlistentry>
<term>.git/gbp.conf</term>
<listitem><para>per repository configuration</para></listitem>
</varlistentry>