diff options
| author | Guido Günther <agx@sigxcpu.org> | 2011-07-29 13:58:54 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2011-07-29 14:00:28 +0200 |
| commit | 9bbbc77feb411cc6c72c0bf6df5b0c22e31729e6 (patch) | |
| tree | 697e820903e2311091655510b338cc4dd919eddc /docs | |
| parent | a6927452ac04a570b8bc5fcfb5490312616eeb66 (diff) | |
Better document --git-upstream-tree
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/chapters/building.sgml | 8 | ||||
| -rw-r--r-- | docs/manpages/git-buildpackage.sgml | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/docs/chapters/building.sgml b/docs/chapters/building.sgml index d6c11f02..911a1ddc 100644 --- a/docs/chapters/building.sgml +++ b/docs/chapters/building.sgml @@ -12,11 +12,9 @@ <screen> &git-buildpackage; <option>--git-ignore-new</option> </screen> - <para>If &git-buildpackage; doesn't find a valid upstream tarball it will create - one by looking at the tag matching the upstream version, if no tag can be - found it uses the tip of the current <option>upstream-branch</option>. Any - other treeish object to create the upstream tarball from can be given with - the <option>--upstream-branch</option> option. + <para>If &git-buildpackage; doesn't find a valid upstream tarball it will + create one by looking at the tag matching the upstream version. To change + this behaviour see the <option>--git-upstream-tree</option> option. </para><para> If you want to recreate the original tarball using the additional information from the <option>pristine-tar branch</option> you have to diff --git a/docs/manpages/git-buildpackage.sgml b/docs/manpages/git-buildpackage.sgml index f79ad6a2..77b7ab1a 100644 --- a/docs/manpages/git-buildpackage.sgml +++ b/docs/manpages/git-buildpackage.sgml @@ -185,8 +185,8 @@ <term><option>--git-upstream-branch</option>=<replaceable>branch_name</replaceable> </term> <listitem> - <para>Branch to build the orig tarball from if no tag matching the - upstream version is found. Default is + <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> </listitem> |