diff options
| author | Guido Günther <agx@sigxcpu.org> | 2013-05-04 14:13:07 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2013-05-04 14:13:07 +0200 |
| commit | 90ffae8f30432c267f1f2165bcae85bf7946bb9e (patch) | |
| tree | e944fddc1f0c46e0ff77dd0a43228cfc741626b5 | |
| parent | 4abfa6a76a2ac5449fd034f4cb97ecae90c184a7 (diff) | |
manpages: Document gbp-pull's --ignore-branch option
| -rw-r--r-- | docs/manpages/gbp-pull.sgml | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/docs/manpages/gbp-pull.sgml b/docs/manpages/gbp-pull.sgml index c100660b..d655955d 100644 --- a/docs/manpages/gbp-pull.sgml +++ b/docs/manpages/gbp-pull.sgml @@ -25,6 +25,7 @@ <arg><option>--force</option></arg> <arg><option>--redo-pq</option></arg> <arg><option>--[no-]pristine-tar</option></arg> + <arg><option>--ignore-branch</option></arg> <arg><option>--debian-branch=</option><replaceable>branch_name</replaceable></arg> <arg><option>--upstream-branch=</option><replaceable>branch_name</replaceable></arg> <arg><option>--depth=</option><replaceable>depth</replaceable></arg> @@ -47,7 +48,7 @@ <term><option>--force</option></term> <listitem> <para>force a branch update even if this results in a non fast - forward update. <warning><para>Forcing a branch updates + forward update. <warning><para>Forcing a branch update makes you lose your modifications.</para></warning></para> </listitem> </varlistentry> @@ -59,6 +60,13 @@ </listitem> </varlistentry> <varlistentry> + <term><option>--ignore-branch</option> + </term> + <listitem> + <para>Don't care if we're on a branch or in detached head state. + </listitem> + </varlistentry> + <varlistentry> <term><option>--debian-branch</option>=<replaceable>branch_name</replaceable> </term> <listitem> |