aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2012-01-08 19:48:24 +0100
committerGuido Günther <agx@sigxcpu.org>2012-01-10 13:15:12 +0100
commit8328c326f1fd40ecf9d6404faaee8658ec37f201 (patch)
treeee1bbecbd455373740b901dfb50228546c504249 /docs
parentd316e22a64bee277efdc21b353294b262eb22c23 (diff)
Allow to specify the upstream tree via --upstream-tree
without the indirection to --upstream-branch.
Diffstat (limited to 'docs')
-rw-r--r--docs/manpages/git-buildpackage.sgml15
1 files changed, 8 insertions, 7 deletions
diff --git a/docs/manpages/git-buildpackage.sgml b/docs/manpages/git-buildpackage.sgml
index 5e5ae73d..b6f02e1a 100644
--- a/docs/manpages/git-buildpackage.sgml
+++ b/docs/manpages/git-buildpackage.sgml
@@ -43,7 +43,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-upstream-tree=</option><replaceable>[TAG|BRANCH|treeish]</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>
@@ -196,9 +196,8 @@
</term>
<listitem>
<para>Branch to build the orig tarball from if <option>--git-upstream-tree</option>
- is set to <replaceable>branch</replaceable>. Default is
- <replaceable>upstream</replaceable>. You can give any treeish object
- here.</para>
+ is set to <replaceable>BRANCH</replaceable>. Default is
+ <replaceable>upstream</replaceable>.</para>
</listitem>
</varlistentry>
<varlistentry>
@@ -334,10 +333,12 @@
</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
+ <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>
+ option. Other values are interpreted as treeishs.
+ </para><para>
+ This doesn't have any effect if <option>--git-pristine-tar</option>
is being used.
</para>
</listitem>