summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-06-06 18:32:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-06-06 18:32:14 (GMT)
commitc8704ad33534b40e14c412f36f83f64cfcbf0359 (patch)
tree8da38da2933fea79f3ca4ef8a550f0e6e38339be /Documentation
parent334d40e951fa3b3961135b3183633706d976c4bd (diff)
parent670a7297c2afe4de387cb208fddc90f0f59df6aa (diff)
downloadgit-c8704ad33534b40e14c412f36f83f64cfcbf0359.zip
git-c8704ad33534b40e14c412f36f83f64cfcbf0359.tar.gz
git-c8704ad33534b40e14c412f36f83f64cfcbf0359.tar.bz2
Merge branch 'wk/doc-clarify-upstream'
* wk/doc-clarify-upstream: Documentation: mention config sources for @{upstream}
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/revisions.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt
index 5a286d0..0796118 100644
--- a/Documentation/revisions.txt
+++ b/Documentation/revisions.txt
@@ -94,7 +94,9 @@ some output processing may assume ref names in UTF-8.
'<branchname>@\{upstream\}', e.g. 'master@\{upstream\}', '@\{u\}'::
The suffix '@\{upstream\}' to a branchname (short form '<branchname>@\{u\}')
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 `branch.<name>.remote` and
+ `branch.<name>.merge`). A missing branchname defaults to the
+ current one.
'<rev>{caret}', e.g. 'HEAD{caret}, v1.5.1{caret}0'::
A suffix '{caret}' to a revision parameter means the first parent of