summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-07-22 11:23:56 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-07-22 11:23:56 -0700
commitd0b3fa8fd9faf5d18d54e2beb04741fff88af358 (patch)
treebc35c4471f726637bd45ee79102dccda7c409c97 /Documentation
parentMerge branch 'es/blame-L-breakage' (diff)
parentshow-ref: make --head always show the HEAD ref (diff)
downloadtgif-d0b3fa8fd9faf5d18d54e2beb04741fff88af358.tar.xz
Merge branch 'db/show-ref-head'
The "--head" option to "git show-ref" was only to add "HEAD" to the list of candidate refs to be filtered by the usual rules (e.g. "--heads" that only show refs under refs/heads). Change the meaning of the option to always show "HEAD" regardless of what filtering will be applied to any other ref (this is a backward incompatible change, so I may need to add an entry to the Release Notes). * db/show-ref-head: show-ref: make --head always show the HEAD ref
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-show-ref.txt10
1 files changed, 6 insertions, 4 deletions
diff --git a/Documentation/git-show-ref.txt b/Documentation/git-show-ref.txt
index de4d352da2..b0a309b117 100644
--- a/Documentation/git-show-ref.txt
+++ b/Documentation/git-show-ref.txt
@@ -21,6 +21,8 @@ commit IDs. Results can be filtered using a pattern and tags can be
dereferenced into object IDs. Additionally, it can be used to test whether a
particular ref exists.
+By default, shows the tags, heads, and remote refs.
+
The --exclude-existing form is a filter that does the inverse, it shows the
refs from stdin that don't exist in the local repository.
@@ -32,14 +34,14 @@ OPTIONS
--head::
- Show the HEAD reference.
+ Show the HEAD reference, even if it would normally be filtered out.
--tags::
--heads::
- Limit to only "refs/heads" and "refs/tags", respectively. These
- options are not mutually exclusive; when given both, references stored
- in "refs/heads" and "refs/tags" are displayed.
+ Limit to "refs/heads" and "refs/tags", respectively. These options
+ are not mutually exclusive; when given both, references stored in
+ "refs/heads" and "refs/tags" are displayed.
-d::
--dereference::