mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'wk/doc-clarify-upstream'
* wk/doc-clarify-upstream: Documentation: mention config sources for @{upstream}
This commit is contained in:
commit
c8704ad335
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue