summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorW. Trevor King <wking@tremily.us>2014-05-13 18:46:57 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-05-13 19:35:00 (GMT)
commit670a7297c2afe4de387cb208fddc90f0f59df6aa (patch)
treeebdc2eabcca776fa92e589d7ad730370cff1fb0e /Documentation
parenteea591373e139fc8aab89a78ccb0b1512a2bf0de (diff)
downloadgit-670a7297c2afe4de387cb208fddc90f0f59df6aa.zip
git-670a7297c2afe4de387cb208fddc90f0f59df6aa.tar.gz
git-670a7297c2afe4de387cb208fddc90f0f59df6aa.tar.bz2
Documentation: mention config sources for @{upstream}
The earlier documentation made vague references to "is set to build on". Flesh that out with references to the config settings, so folks can use git-config(1) to get more detail on what @{upstream} means. For example, @{upstream} does not care about remote.pushdefault or branch.<name>.pushremote. Signed-off-by: W. Trevor King <wking@tremily.us> Signed-off-by: Junio C Hamano <gitster@pobox.com>
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