Merge branch 'il/rev-glob'

diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt
index d375f1af1025698f73900d7eacdf8dc314a87278..c9184fcc767cff509ca185416ec8e02e1c62a2a8 100644 (file)
--- a/Documentation/git-rev-parse.txt
+++ b/Documentation/git-rev-parse.txt
@@ -103,14 +103,24 @@ OPTIONS
 --all::
        Show all refs found in `$GIT_DIR/refs`.
 
---branches::
-       Show branch refs found in `$GIT_DIR/refs/heads`.
-
---tags::
-       Show tag refs found in `$GIT_DIR/refs/tags`.
-
---remotes::
-       Show tag refs found in `$GIT_DIR/refs/remotes`.
+--branches[=pattern]::
+--tags[=pattern]::
+--remotes[=pattern]::
+       Show all branches, tags, or remote-tracking branches,
+       respectively (i.e., refs found in `$GIT_DIR/refs/heads`,
+       `$GIT_DIR/refs/tags`, or `$GIT_DIR/refs/remotes`,
+       respectively).
++
+If a `pattern` is given, only refs matching the given shell glob are
+shown.  If the pattern does not contain a globbing character (`?`,
+`\*`, 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 (`?`, `\*`, or `[`), it is turned into a prefix
+       match by appending `/\*`.
 
 --show-toplevel::
        Show the absolute path of the top-level directory.