Skip to content

Commit 670a729

Browse files
wkinggitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent eea5913 commit 670a729

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

Documentation/revisions.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,9 @@ some output processing may assume ref names in UTF-8.
9494
'<branchname>@\{upstream\}', e.g. 'master@\{upstream\}', '@\{u\}'::
9595
The suffix '@\{upstream\}' to a branchname (short form '<branchname>@\{u\}')
9696
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.
98100

99101
'<rev>{caret}', e.g. 'HEAD{caret}, v1.5.1{caret}0'::
100102
A suffix '{caret}' to a revision parameter means the first parent of

0 commit comments

Comments
 (0)