From: Thomas Rast <trast@student.ethz.ch>
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.tokkee.org/?a=commitdiff_plain;h=3c651491f28e01a9ee0ddaecd05fb7a211d218c3;p=git.git

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>
---

diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt
index fc731525d..d677c72d5 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.