Sync with maint

diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt
index f63b81aad6dd8d0fc7de0c6d9dac5f8e8dc65d6a..3c63561f02aca6f934c47a2897f8e50cf4ac5fe5 100644 (file)
--- a/Documentation/git-rev-parse.txt
+++ b/Documentation/git-rev-parse.txt
@@ -101,6 +101,12 @@ OPTIONS
        The option core.warnAmbiguousRefs is used to select the strict
        abbreviation mode.
 
+--disambiguate=<prefix>::
+       Show every object whose name begins with the given prefix.
+       The <prefix> must be at least 4 hexadecimal digits long to
+       avoid listing each and every object in the repository by
+       mistake.
+
 --all::
        Show all refs found in `refs/`.
 
@@ -137,7 +143,8 @@ shown.  If the pattern does not contain a globbing character (`?`,
 
 --git-dir::
        Show `$GIT_DIR` if defined. Otherwise show the path to
-       the .git directory, relative to the current directory.
+       the .git directory. The path shown, when relative, is
+       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