Sync with maint

diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt
index 8d90863ee3aa43c24170abd3118f4e00e5d4a208..3c63561f02aca6f934c47a2897f8e50cf4ac5fe5 100644 (file)
--- a/Documentation/git-rev-parse.txt
+++ b/Documentation/git-rev-parse.txt
@@ -119,15 +119,14 @@ OPTIONS
 +
 If a `pattern` is given, only refs matching the given shell glob are
 shown.  If the pattern does not contain a globbing character (`?`,
-`{asterisk}`, or `[`), it is turned into a prefix match by
-appending `/{asterisk}`.
+`*`, or `[`), it is turned into a prefix match by appending `/*`.
 
 --glob=pattern::
        Show all refs matching the shell glob pattern `pattern`. If
        the pattern does not start with `refs/`, this is automatically
        prepended.  If the pattern does not contain a globbing
-       character (`?`, `{asterisk}`, or `[`), it is turned into a prefix
-       match by appending `/{asterisk}`.
+       character (`?`, `*`, or `[`), it is turned into a prefix
+       match by appending `/*`.
 
 --show-toplevel::
        Show the absolute path of the top-level directory.
@@ -144,7 +143,8 @@ appending `/{asterisk}`.
 
 --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