summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Rast <trast@student.ethz.ch>2010-02-10 17:30:29 +0100
committerJunio C Hamano <gitster@pobox.com>2010-02-10 10:01:43 -0800
commit3c651491f28e01a9ee0ddaecd05fb7a211d218c3 (patch)
tree19dcb96c90e79b3138318f6ac3567c5498b3cf86
parent8b2337a5893479ee18dfb21a1d4aa5fc1608872d (diff)
downloadgit-3c651491f28e01a9ee0ddaecd05fb7a211d218c3.tar.gz
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>
-rw-r--r--Documentation/git-rev-parse.txt2
1 files changed, 1 insertions, 1 deletions
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 '@\{-<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.