Merge branch 'jc/merge-tag-object'

diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt
index 3c63561f02aca6f934c47a2897f8e50cf4ac5fe5..10a116faf8f681c9984c9b52949e84c227fdc26e 100644 (file)
--- a/Documentation/git-rev-parse.txt
+++ b/Documentation/git-rev-parse.txt
@@ -14,7 +14,7 @@ SYNOPSIS
 DESCRIPTION
 -----------
 
-Many git porcelainish commands take mixture of flags
+Many Git porcelainish commands take mixture of flags
 (i.e. parameters that begin with a dash '-') and parameters
 meant for the underlying 'git rev-list' command they use internally
 and flags and parameters for the other commands they use
@@ -147,7 +147,7 @@ shown.  If the pattern does not contain a globbing character (`?`,
        relative to the current working directory.
 +
 If `$GIT_DIR` is not defined and the current directory
-is not detected to lie in a git repository or work tree
+is not detected to lie in a Git repository or work tree
 print a message to stderr and exit with nonzero status.
 
 --is-inside-git-dir::
@@ -187,9 +187,11 @@ print a message to stderr and exit with nonzero status.
        Flags and parameters to be parsed.
 
 --resolve-git-dir <path>::
-       Check if <path> is a valid git-dir or a git-file pointing to a valid
-       git-dir. If <path> is a valid git-dir the resolved path to git-dir will
-       be printed.
+       Check if <path> is a valid repository or a gitfile that
+       points at a valid repository, and print the location of the
+       repository.  If <path> is a gitfile then the resolved path
+       to the real repository is printed.
+
 
 include::revisions.txt[]