From 3c651491f28e01a9ee0ddaecd05fb7a211d218c3 Mon Sep 17 00:00:00 2001 From: Thomas Rast Date: Wed, 10 Feb 2010 17:30:29 +0100 Subject: 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 --- Documentation/git-rev-parse.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation') 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. -- cgit v1.2.3