diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-06-06 12:16:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-06 12:16:29 -0700 |
| commit | e1aeb5ef657d0c4fdff12a9c7503431edd9cd128 (patch) | |
| tree | 0b26e69547edd5d5bbc66d1dd470d1ce66463b1e /gitrevisions.html | |
| parent | b051caf02ee59e3c9d1da4a61339f667f28754d1 (diff) | |
| download | git-htmldocs-e1aeb5ef657d0c4fdff12a9c7503431edd9cd128.tar.gz | |
Autogenerated HTML docs for v2.0.0-239-g09531
Diffstat (limited to 'gitrevisions.html')
| -rw-r--r-- | gitrevisions.html | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gitrevisions.html b/gitrevisions.html index 20f806c91..c72ddcc7e 100644 --- a/gitrevisions.html +++ b/gitrevisions.html @@ -923,7 +923,9 @@ some output processing may assume ref names in UTF-8.</p></div> <p>
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.
+ top of (configured with <tt>branch.<name>.remote</tt> and
+ <tt>branch.<name>.merge</tt>). A missing branchname defaults to the
+ current one.
</p>
</dd>
<dt class="hdlist1">
|