diff options
| author | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2012-01-12 15:35:37 +0200 |
|---|---|---|
| committer | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2014-11-14 14:22:11 +0200 |
| commit | d27716d1b47528457cf60340db3d0786c7ea517e (patch) | |
| tree | 88d96ef58aa2cd9f9c442c75647b32efc66a3b8f /docs | |
| parent | 61fb96fa54a94cd7f7e27edcc1b9e72655c6cee1 (diff) | |
| download | git-buildpackage-d27716d1b47528457cf60340db3d0786c7ea517e.tar.gz git-buildpackage-d27716d1b47528457cf60340db3d0786c7ea517e.tar.bz2 git-buildpackage-d27716d1b47528457cf60340db3d0786c7ea517e.zip | |
Add 'packaging-branch' cmdline option
This is the counterpart of 'debian-branch' (basically identical to that)
to not confuse rpm maintainers.
Also, adds this option to gbp-clone and gbp-pull commands (as an
alternative to the 'debian-branch option), which are usable for RPM in
their current form.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/manpages/gbp-clone.sgml | 13 | ||||
| -rw-r--r-- | docs/manpages/gbp-pull.sgml | 13 |
2 files changed, 24 insertions, 2 deletions
diff --git a/docs/manpages/gbp-clone.sgml b/docs/manpages/gbp-clone.sgml index 20e61472..49418ac7 100644 --- a/docs/manpages/gbp-clone.sgml +++ b/docs/manpages/gbp-clone.sgml @@ -24,7 +24,10 @@ &man.common.options.synopsis; <arg><option>--all</option></arg> <arg><option>--[no-]pristine-tar</option></arg> - <arg><option>--debian-branch=</option><replaceable>branch_name</replaceable></arg> + <group> + <arg><option>--debian-branch=</option><replaceable>branch_name</replaceable></arg> + <arg><option>--packaging-branch=</option><replaceable>branch_name</replaceable></arg> + </group> <arg><option>--upstream-branch=</option><replaceable>branch_name</replaceable></arg> <arg><option>--depth=</option><replaceable>depth</replaceable></arg> <arg choice="plain"><replaceable>remote_uri</replaceable></arg> @@ -62,6 +65,14 @@ </listitem> </varlistentry> <varlistentry> + <term><option>--packaging-branch</option>=<replaceable>branch_name</replaceable> + </term> + <listitem> + <para>The branch the packaging is being maintained on. + Alternative to the <emphasis>--debian-branch</emphasis> option.</para> + </listitem> + </varlistentry> + <varlistentry> <term><option>--upstream-branch</option>=<replaceable>branch_name</replaceable> </term> <listitem> diff --git a/docs/manpages/gbp-pull.sgml b/docs/manpages/gbp-pull.sgml index 5c7f258f..74ff37ce 100644 --- a/docs/manpages/gbp-pull.sgml +++ b/docs/manpages/gbp-pull.sgml @@ -27,7 +27,10 @@ <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> + <group> + <arg><option>--debian-branch=</option><replaceable>branch_name</replaceable></arg> + <arg><option>--packaging-branch=</option><replaceable>branch_name</replaceable></arg> + </group> <arg><option>--upstream-branch=</option><replaceable>branch_name</replaceable></arg> <arg><option>--depth=</option><replaceable>depth</replaceable></arg> </cmdsynopsis> @@ -88,6 +91,14 @@ </listitem> </varlistentry> <varlistentry> + <term><option>--packaging-branch</option>=<replaceable>branch_name</replaceable> + </term> + <listitem> + <para>The branch the packaging is being maintained on. + Alternative to the <emphasis>--debian-branch</emphasis> option.</para> + </listitem> + </varlistentry> + <varlistentry> <term><option>--upstream-branch</option>=<replaceable>branch_name</replaceable> </term> <listitem> |