mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
Documentation: quote braces in {upstream} notation
The lack of quoting made the entire line disappear. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
8b2337a589
commit
3c651491f2
|
@ -244,7 +244,7 @@ when you run 'git merge'.
|
|||
* The special construct '@\{-<n>\}' means the <n>th branch checked out
|
||||
before the current one.
|
||||
|
||||
* The suffix '@{upstream}' to a ref (short form 'ref@{u}') refers to
|
||||
* The suffix '@\{upstream\}' to a ref (short form 'ref@\{u\}') refers to
|
||||
the branch the ref is set to build on top of. Missing ref defaults
|
||||
to the current branch.
|
||||
|
||||
|
|
Loading…
Reference in a new issue