aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorGuido Guenther <agx@sigxcpu.org>2006-12-05 19:34:22 +0100
committerGuido Guenther <agx@bogon.sigxcpu.org>2006-12-05 19:34:22 +0100
commiteab964d1fe31b91a9beca6014e61cdf36c96d11e (patch)
treea2050d58caf2d2ec4652b3d8bea1cc6dc0f53806 /docs
parent64acc5b038f9011dfa8afd74b633c12689a06945 (diff)
config file parsing to set default branches and build commands
Diffstat (limited to 'docs')
-rw-r--r--docs/manpages/git-buildpackage.sgml35
-rw-r--r--docs/manpages/git-import-dsc.sgml26
-rw-r--r--docs/manpages/git-import-orig.sgml25
3 files changed, 85 insertions, 1 deletions
diff --git a/docs/manpages/git-buildpackage.sgml b/docs/manpages/git-buildpackage.sgml
index 913b629..0a151e0 100644
--- a/docs/manpages/git-buildpackage.sgml
+++ b/docs/manpages/git-buildpackage.sgml
@@ -28,6 +28,7 @@
<arg><option>--git-ignore-new</option></arg>
<arg><option>--git-tag</option></arg>
<arg><option>--git-verbose</option></arg>
+ <arg><option>--upstream-branch=<replaceable>branch_name</replaceable></option></arg>
<arg><option>--git-builder=<replaceable>BUILD_CMD</replaceable></option></arg>
</cmdsynopsis>
</refsynopsisdiv>
@@ -43,6 +44,8 @@
<listitem><para>Verify that it is being executed from the
proper location.</para>
</listitem>
+ <listitem><para>Build an orig.tar.gz if it doesn't exist.</para>
+ </listitem>
<listitem><para>Call <application>debuild</application> (1)
(or the application specified via --git-builder)
with arguments instructing it to ignore Git meta-data in
@@ -86,7 +89,39 @@
<para>Verbose execution</para>
</listitem>
</varlistentry>
+ <varlistentry>
+ <term><option>--git-upstream-branch</option>=<replaceable>branch_name</replaceable>
+ </term>
+ <listitem>
+ <para>Branch to build the orig.tar.gz from. Default is 'upstream'</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect1>
+ <refsect1>
+ <title>CONFIGURATION FILES</title>
+ Three configuration files are parsed:
+ <variablelist>
+ <varlistentry>
+ <term>/etc/git-buildpacakge/gbp.conf</term>
+ </varlistentry>
+ <varlistitem>- system wide configuraton</varlistitem>
+ <varlistentry>
+ <term>~/.gbp.conf</term>
+ </varlistentry>
+ <varlistentry>
+ - per user configuration
+ </varlistentry>
+ <varlistentry>
+ <term>\.git/gbp.conf</term>
+ </varlistentry>
+ <varlistentry>
+ - per repository configuration
+ </varlistentry>
</variablelist>
+ <para>
+ See /etc/git-buildpacakge/gbp.conf for an example.
+ </para>
</refsect1>
<refsect1>
<title>SEE ALSO</title>
diff --git a/docs/manpages/git-import-dsc.sgml b/docs/manpages/git-import-dsc.sgml
index 22a5f6e..7dec2f6 100644
--- a/docs/manpages/git-import-dsc.sgml
+++ b/docs/manpages/git-import-dsc.sgml
@@ -61,10 +61,34 @@
</variablelist>
</refsect1>
<refsect1>
+ <title>CONFIGURATION FILES</title>
+ Three configuration files are parsed:
+ <variablelist>
+ <varlistentry>
+ <term>/etc/git-buildpacakge/gbp.conf</term>
+ </varlistentry>
+ <varlistitem>- system wide configuraton</varlistitem>
+ <varlistentry>
+ <term>~/.gbp.conf</term>
+ </varlistentry>
+ <varlistentry>
+ - per user configuration
+ </varlistentry>
+ <varlistentry>
+ <term>\.git/gbp.conf</term>
+ </varlistentry>
+ <varlistentry>
+ - per repository configuration
+ </varlistentry>
+ </variablelist>
+ <para>
+ See /etc/git-buildpacakge/gbp.conf for an example.
+ </para>
+ </refsect1>
+ <refsect1>
<title>SEE ALSO</title>
<para>git-buildpackage (1), git-import-orig (1), git (1), git_load_dirs (1)</para>
-
</refsect1>
<refsect1>
<title>AUTHOR</title>
diff --git a/docs/manpages/git-import-orig.sgml b/docs/manpages/git-import-orig.sgml
index 01068df..0e50739 100644
--- a/docs/manpages/git-import-orig.sgml
+++ b/docs/manpages/git-import-orig.sgml
@@ -85,6 +85,31 @@
</variablelist>
</refsect1>
<refsect1>
+ <title>CONFIGURATION FILES</title>
+ Three configuration files are parsed:
+ <variablelist>
+ <varlistentry>
+ <term>/etc/git-buildpacakge/gbp.conf</term>
+ </varlistentry>
+ <varlistitem>- system wide configuraton</varlistitem>
+ <varlistentry>
+ <term>~/.gbp.conf</term>
+ </varlistentry>
+ <varlistentry>
+ - per user configuration
+ </varlistentry>
+ <varlistentry>
+ <term>\.git/gbp.conf</term>
+ </varlistentry>
+ <varlistentry>
+ - per repository configuration
+ </varlistentry>
+ </variablelist>
+ <para>
+ See /etc/git-buildpacakge/gbp.conf for an example.
+ </para>
+ </refsect1>
+ <refsect1>
<title>SEE ALSO</title>
<para>git-buildpackage (1), git-import-dsc (1), git (1), git_load_dirs (1)</para>