diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-03-17 16:39:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-17 16:39:09 -0700 |
| commit | fa156ead3ef3991c2ca287ac33572a01ac404180 (patch) | |
| tree | eb8f8eb4276e3253e96a65377b99ea882c848ed3 /git-rev-parse.html | |
| parent | 353e1c93c34e087ca734dd318aba983ee0b4ca04 (diff) | |
| download | git-htmldocs-fa156ead3ef3991c2ca287ac33572a01ac404180.tar.gz | |
Autogenerated HTML docs for v1.8.2-6-g1c715
Diffstat (limited to 'git-rev-parse.html')
| -rw-r--r-- | git-rev-parse.html | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/git-rev-parse.html b/git-rev-parse.html index 5a0491f16..05f8d2ae1 100644 --- a/git-rev-parse.html +++ b/git-rev-parse.html @@ -1256,13 +1256,13 @@ some output processing may assume ref names in UTF-8.</p></div> </p>
</dd>
<dt class="hdlist1">
-<em><refname>@{upstream}</em>, e.g. <em>master@{upstream}</em>, <em>@{u}</em>
+<em><branchname>@{upstream}</em>, e.g. <em>master@{upstream}</em>, <em>@{u}</em>
</dt>
<dd>
<p>
- The suffix <em>@{upstream}</em> to a ref (short form <em><refname>@{u}</em>) refers to
- the branch the ref is set to build on top of. A missing ref defaults
- to the current branch.
+ The suffix <em>@{upstream}</em> to a branchname (short form <em><branchname>@{u}</em>)
+ refers to the branch that the branch specified by branchname is set to build on
+ top of. A missing branchname defaults to the current one.
</p>
</dd>
<dt class="hdlist1">
|