Merge branch 'jk/grep-double-dash'

[git.git] / Documentation / git-rev-parse.txt

diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt
index e7845d4055f81caf2fa92268a17837514f08c4d3..d677c72d5ea6a8d38cf77f663e6b5da591028efa 100644 (file)
--- a/Documentation/git-rev-parse.txt
+++ b/Documentation/git-rev-parse.txt
@@ -33,7 +33,7 @@ OPTIONS
 --stop-at-non-option::
        Only meaningful in `--parseopt` mode.  Lets the option parser stop at
        the first non-option argument.  This can be used to parse sub-commands
 --stop-at-non-option::
        Only meaningful in `--parseopt` mode.  Lets the option parser stop at
        the first non-option argument.  This can be used to parse sub-commands

-       that take options themself.
+       that take options themselves.

 
 --sq-quote::
        Use 'git rev-parse' in shell quoting mode (see SQ-QUOTE
 
 --sq-quote::
        Use 'git rev-parse' in shell quoting mode (see SQ-QUOTE


@@ -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 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.
 
   the branch the ref is set to build on top of.  Missing ref defaults
   to the current branch.