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>
W. Trevor King committed
May 13, 2014 at 11:46 UTC
670a7297c2afe4de387cb208fddc90f0f59df6aa
1 file changed
+3
-1
Documentation/revisions.txt
+3
-1
@@ -94,7 +94,9 @@ some output processing may assume ref names in UTF-8.
94
'<branchname>@\{upstream\}', e.g. 'master@\{upstream\}', '@\{u\}'::
95
The suffix '@\{upstream\}' to a branchname (short form '<branchname>@\{u\}')
96
refers to the branch that the branch specified by branchname is set to build on
97
- top of. A missing branchname defaults to the current one.
97
+ top of (configured with `branch.<name>.remote` and
98
+ `branch.<name>.merge`). A missing branchname defaults to the
99
+ current one.
100
101
'<rev>{caret}', e.g. 'HEAD{caret}, v1.5.1{caret}0'::
102
A suffix '{caret}' to a revision parameter means the first parent of