diff options
| author | Guido Guenther <agx@sigxcpu.org> | 2007-10-17 20:06:06 +0200 |
|---|---|---|
| committer | Guido Guenther <agx@sigxcpu.org> | 2007-10-17 20:06:06 +0200 |
| commit | 34d0347a72f22683a5d32bf07211182db330cf07 (patch) | |
| tree | 7318511484adf8d45bebb21c895b1eb929ba081a /docs/manpages/manpages.ent | |
| parent | 0a346fb1cb81b7bb669d24bf24e8ebc1e04dda03 (diff) | |
Documentation updates
Diffstat (limited to 'docs/manpages/manpages.ent')
| -rw-r--r-- | docs/manpages/manpages.ent | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/docs/manpages/manpages.ent b/docs/manpages/manpages.ent index 7a00f0b..ad56359 100644 --- a/docs/manpages/manpages.ent +++ b/docs/manpages/manpages.ent @@ -4,7 +4,7 @@ <!ENTITY man.git.dch SYSTEM "git-dch.sgml"> <!ENTITY man.git.config-files " <title>CONFIGURATION FILES</title> - <para> Three configuration files are parsed to set defaults for the above + <para>Four configuration files are parsed to set defaults for the above commandline arguments: </para> <variablelist> <varlistentry> @@ -16,10 +16,15 @@ <listitem><para>per user configuration</para></listitem> </varlistentry> <varlistentry> + <term>.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 working copy configuration</para></listitem> + <listitem><para>per repository configuration</para></listitem> </varlistentry> </variablelist> <para> - See /etc/git-buildpackage/gbp.conf for an example. + See <filename>/etc/git-buildpackage/gbp.conf</filename> for an example. </para>"> |