diff options
| author | Guido Günther <agx@sigxcpu.org> | 2010-06-19 15:55:28 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2010-06-19 16:05:46 +0200 |
| commit | 5988e2087615a3eb218cbee7c6eb470b9df9be0c (patch) | |
| tree | 59229dd3a4dfdd8cc8e8a426124ceafe26bdd151 /docs | |
| parent | 7f0b81f1f8f132dbc6869613382a5455e8af3078 (diff) | |
Add 'ignore-branch' option
This disables the 'current branch' == 'debian-branch' check.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/manpages/git-buildpackage.sgml | 14 | ||||
| -rw-r--r-- | docs/manpages/git-dch.sgml | 9 |
2 files changed, 21 insertions, 2 deletions
diff --git a/docs/manpages/git-buildpackage.sgml b/docs/manpages/git-buildpackage.sgml index 5d3d7231..a5cd159d 100644 --- a/docs/manpages/git-buildpackage.sgml +++ b/docs/manpages/git-buildpackage.sgml @@ -24,6 +24,7 @@ <arg><option>--git-verbose</option></arg> <arg><option>--git-upstream-branch=</option><replaceable>treeish</replaceable></arg> <arg><option>--git-debian-branch=</option><replaceable>branch_name</replaceable></arg> + <arg><option>--git-ignore-branch</option></arg> <arg><option>--git-builder=</option><replaceable>BUILD_CMD</replaceable></arg> <arg><option>--git-cleaner=</option><replaceable>CLEAN_CMD</replaceable></arg> <arg><option>--git-[no-]sign-tags</option></arg> @@ -93,8 +94,9 @@ <term><option>--git-[no-]ignore-new</option> </term> <listitem> - <para>Build the .diff.gz and debian package although there are - uncommitted changes in the source tree.</para> + <para>Don't abort if there are uncommitted changes in the source tree + or the current branch doesn't match the + <replaceable>debian-branch</replaceable>. </listitem> </varlistentry> <varlistentry> @@ -146,6 +148,14 @@ </listitem> </varlistentry> <varlistentry> + <term><option>--git-ignore-branch</option> + </term> + <listitem> + <para>Don't check if the current branch matches + <replaceable>debian-branch</replaceable>.</para> + </listitem> + </varlistentry> + <varlistentry> <term><option>--git-[no-]sign-tags</option> </term> <listitem> diff --git a/docs/manpages/git-dch.sgml b/docs/manpages/git-dch.sgml index 22491f40..e8683eb0 100644 --- a/docs/manpages/git-dch.sgml +++ b/docs/manpages/git-dch.sgml @@ -24,6 +24,7 @@ <arg><option>--verbose</option></arg> <arg><option>--debian-branch=</option><replaceable>branch_name</replaceable></arg> <arg><option>--debian-tag=</option><replaceable>tag-format</replaceable></arg> + <arg><option>--ignore-branch</option></arg> <arg><option>--since=</option><replaceable>commitish</replaceable></arg> <arg><option>--snapshot</option></arg> <arg><option>--release</option></arg> @@ -74,6 +75,14 @@ </listitem> </varlistentry> <varlistentry> + <term><option>--ignore-branch</option> + </term> + <listitem> + <para>Don't check if the current branch matches + <replaceable>debian-branch</replaceable>.</para> + </listitem> + </varlistentry> + <varlistentry> <term><option>--verbose</option></term> <term><option>-v</option></term> <listitem> |