From: Thomas Rast Date: Wed, 10 Feb 2010 16:30:29 +0000 (+0100) Subject: Documentation: quote braces in {upstream} notation X-Git-Tag: v1.7.0~9 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3c651491f28e01a9ee0ddaecd05fb7a211d218c3?ds=inline;hp=-c Documentation: quote braces in {upstream} notation The lack of quoting made the entire line disappear. Signed-off-by: Thomas Rast Signed-off-by: Junio C Hamano --- 3c651491f28e01a9ee0ddaecd05fb7a211d218c3 diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt index fc731525da..d677c72d5e 100644 --- a/Documentation/git-rev-parse.txt +++ b/Documentation/git-rev-parse.txt @@ -244,7 +244,7 @@ when you run 'git merge'. * The special construct '@\{-\}' means the 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.