Merge branch 'sp/smart-http-failure-to-push'

diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt
index 02c44c999f361cd7c40a504ae4ccdc2d8b1a18fe..8023dc086d044d0ac2cab685ac1c8b050adda95b 100644 (file)
--- a/Documentation/git-rev-parse.txt
+++ b/Documentation/git-rev-parse.txt
@@ -8,6 +8,7 @@ git-rev-parse - Pick out and massage parameters
 
 SYNOPSIS
 --------
+[verse]
 'git rev-parse' [ --option ] <args>...
 
 DESCRIPTION
@@ -179,6 +180,10 @@ print a message to stderr and exit with nonzero status.
 <args>...::
        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.
 
 include::revisions.txt[]