summaryrefslogtreecommitdiffstats
path: root/git-rev-parse.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@kernel.org>2010-01-23 03:02:50 +0000
committerJunio C Hamano <junio@kernel.org>2010-01-23 03:02:50 +0000
commit57827fb28944ab9eee73efc93f04fb6dfc6e36a8 (patch)
tree935f9e461c67a51943bca7879ec02af645e62d67 /git-rev-parse.txt
parent364b6a4e15285cad6c674f515c0aa3538cfed028 (diff)
downloadgit-htmldocs-57827fb28944ab9eee73efc93f04fb6dfc6e36a8.tar.gz
Autogenerated HTML docs for v1.6.6.1-436-gaba7d
Diffstat (limited to 'git-rev-parse.txt')
-rw-r--r--git-rev-parse.txt28
1 files changed, 21 insertions, 7 deletions
diff --git a/git-rev-parse.txt b/git-rev-parse.txt
index d375f1af1..e7845d405 100644
--- a/git-rev-parse.txt
+++ b/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`.
+--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 `/\*`.
---remotes::
- Show tag refs found in `$GIT_DIR/refs/remotes`.
+--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.
@@ -234,6 +244,10 @@ when you run 'git merge'.
* The special construct '@\{-<n>\}' means the <n>th branch checked out
before the current one.
+* The suffix '@{upstream}' to a ref (short form 'ref@{u}') refers to
+ the branch the ref is set to build on top of. Missing ref defaults
+ to the current branch.
+
* A suffix '{caret}' to a revision parameter means the first parent of
that commit object. '{caret}<n>' means the <n>th parent (i.e.
'rev{caret}'