diff options
| author | Ricardo Salveti de Araujo <ricardo.salveti@canonical.com> | 2011-04-13 03:33:14 -0300 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2011-07-23 15:51:21 +0200 |
| commit | 0ecd9f70aef51e26c13a0fcc241a3dcb934aeaaf (patch) | |
| tree | cae3c6bb8668ee71ad18041ed20bf498c068d1f5 /docs | |
| parent | 8ce3500b66827904504c4b62331520c898103828 (diff) | |
git-buildpackage: Add upstream-tree option
to specify where the upstream tarball should be created from. The
default is to create the upstream tarball from the exact tag and fail
otherwise. To create the upstream tarball from the tip of the upstream
branch use 'branch'.
Based on a patch by Ricardo Salveti de Araujo
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/manpages/git-buildpackage.sgml | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/docs/manpages/git-buildpackage.sgml b/docs/manpages/git-buildpackage.sgml index 78c7aca7..f79ad6a2 100644 --- a/docs/manpages/git-buildpackage.sgml +++ b/docs/manpages/git-buildpackage.sgml @@ -41,6 +41,7 @@ <arg><option>--git-debian-tag=</option><replaceable>tag-format</replaceable></arg> <arg><option>--git-force-create</option></arg> <arg><option>--git-no-create-orig</option></arg> + <arg><option>--git-upstream-tree=</option><replaceable>[tag|branch]</replaceable></arg> <arg><option>--git-tarball-dir=</option><replaceable>directory</replaceable></arg> <arg><option>--git-compression=</option><replaceable>type</replaceable></arg> <arg><option>--git-compression-level=</option><replaceable>level</replaceable></arg> @@ -307,6 +308,19 @@ </listitem> </varlistentry> <varlistentry> + <term><option>--git-upstream-tree=</option><replaceable>[tag|branch]</replaceable> + </term> + <listitem> + <para>How to find the upstream sources used to generate the tarball. + <replaceable>tag</replaceable> looks at a tag corresponding to the + version in the changelog. <replaceable>branch</replaceable> looks at + the upstream branch given via the <option>--git-upstream-branch</option> + option. This doesn't have any effect if <option>--git-pristine-tar</option> + is being used. + </para> + </listitem> + </varlistentry> + <varlistentry> <term><option>--git-tarball-dir=</option><replaceable>directory</replaceable> </term> <listitem> |