From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 23 Jan 2010 00:08:16 +0000 (-0800)
Subject: Merge branch 'il/rev-glob'
X-Git-Tag: v1.7.0-rc0~19
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=78bc024ab075f4d5d9cc0b6540b538f3d93d04cb;p=git.git

Merge branch 'il/rev-glob'

* il/rev-glob:
  Documentation: improve description of --glob=pattern and friends
  rev-parse --branches/--tags/--remotes=pattern
  rev-parse --glob
---

78bc024ab075f4d5d9cc0b6540b538f3d93d04cb
diff --cc Documentation/git-rev-parse.txt
index 818eb48d6,61f4835a1..e7845d405
--- a/Documentation/git-rev-parse.txt
+++ b/Documentation/git-rev-parse.txt
@@@ -103,18 -103,25 +103,28 @@@ OPTION
  --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.
 +
  --show-prefix::
  	When the command is invoked from a subdirectory, show the
  	path of the current directory relative to the top-level