diff options
Diffstat (limited to 'docs/manpages/git-buildpackage.sgml')
-rw-r--r-- | docs/manpages/git-buildpackage.sgml | 46 |
1 files changed, 20 insertions, 26 deletions
diff --git a/docs/manpages/git-buildpackage.sgml b/docs/manpages/git-buildpackage.sgml index 0a151e0f..bf473af3 100644 --- a/docs/manpages/git-buildpackage.sgml +++ b/docs/manpages/git-buildpackage.sgml @@ -24,12 +24,14 @@ <refsynopsisdiv> <cmdsynopsis> &git-buildpackage; - <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>--debian-branch=<replaceable>branch_name</replaceable></option></arg> <arg><option>--git-builder=<replaceable>BUILD_CMD</replaceable></option></arg> + <arg><option>--git-sign-tags</option></arg> + <arg><option>--git-keyid</option></arg> </cmdsynopsis> </refsynopsisdiv> <refsect1> @@ -44,6 +46,12 @@ <listitem><para>Verify that it is being executed from the proper location.</para> </listitem> + <listitem><para>Verify that the reopository doesn't contain any + uncommitted source changes.</para> + </listitem> + <listitem><para>Verify that it is being executed from the + correct branch.</para> + </listitem> <listitem><para>Build an orig.tar.gz if it doesn't exist.</para> </listitem> <listitem><para>Call <application>debuild</application> (1) @@ -80,8 +88,6 @@ <para>Use <replaceable>BUILD_CMD</replaceable> instead of <command>debuild</command></para> </listitem> </varlistentry> - </variablelist> - <variablelist> <varlistentry> <term><option>--git-verbose</option> </term> @@ -96,34 +102,22 @@ <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 + <term><option>--git-debian-branch</option>=<replaceable>branch_name</replaceable> + </term> + <listitem> + <para>If you're not on this branch when invoking &git-buildpackage; + it will fail. Default is 'master'. This option will be ignored + when using <option>--git-ignore-new</option>. + </para> + </listitem> </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> + &man.git.config-files; + <para>All options in the config files are specified without the 'git-' prefix. + <refsect1> <title>SEE ALSO</title> <para>git-import-dsc (1), git-import-orig (1), debuild (1), git (1)</para> |