Merge branch 'ap/prune'

[git.git] / Documentation / git-show-ref.txt

diff --git a/Documentation/git-show-ref.txt b/Documentation/git-show-ref.txt
index b724d832c8bef16c46bc7955cdbe7033d713e4a7..5973a82517f2b64e5575b891a2fcee8ad0664b8a 100644 (file)
--- a/Documentation/git-show-ref.txt
+++ b/Documentation/git-show-ref.txt
@@ -9,7 +9,7 @@ SYNOPSIS
 --------
 [verse]
 'git-show-ref' [-q|--quiet] [--verify] [-h|--head] [-d|--dereference]
-            [-s|--hash] [--tags] [--heads] [--] <pattern>...
+            [-s|--hash] [--abbrev] [--tags] [--heads] [--] <pattern>...
 
 DESCRIPTION
 -----------
@@ -37,14 +37,13 @@ OPTIONS
 
 -d, --dereference::
 
-       Dereference tags into object IDs. They will be shown with "^{}"
+       Dereference tags into object IDs as well. They will be shown with "^{}"
        appended.
 
 -s, --hash::
 
        Only show the SHA1 hash, not the reference name. When also using
-       --dereference the dereferenced tag will still be shown after the SHA1,
-       this maybe a bug.
+       --dereference the dereferenced tag will still be shown after the SHA1.
 
 --verify::
 
@@ -52,6 +51,11 @@ OPTIONS
        Aside from returning an error code of 1, it will also print an error
        message if '--quiet' was not specified.
 
+--abbrev, --abbrev=len::
+
+       Abbreviate the object name.  When using `--hash`, you do
+       not have to say `--hash --abbrev`; `--hash=len` would do.
+
 -q, --quiet::
 
        Do not print any results to stdout. When combined with '--verify' this