Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Documentation: quote braces in {upstream} notation
author
Thomas Rast
<trast@student.ethz.ch>
Wed, 10 Feb 2010 16:30:29 +0000
(17:30 +0100)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 10 Feb 2010 18:01:43 +0000
(10:01 -0800)
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>
Documentation/git-rev-parse.txt
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
8b2337a
)
diff --git
a/Documentation/git-rev-parse.txt
b/Documentation/git-rev-parse.txt
index fc731525da7a50cda2f55fcfd4fa9e17f531582b..d677c72d5ea6a8d38cf77f663e6b5da591028efa 100644
(file)
--- 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.