summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-03-04 23:35:23 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-03-04 23:35:23 -0800
commitb8b52907e386d064fb0303c08215d7b117d50ee9 (patch)
tree29548ce0a8bc72bdca63db8ae09fba077f64c3cc /Documentation
parentMerge branch 'jn/gitweb-hilite-regions' (diff)
parentsymbolic-ref --short: abbreviate the output unambiguously (diff)
downloadtgif-b8b52907e386d064fb0303c08215d7b117d50ee9.tar.xz
Merge branch 'jk/symbolic-ref-short'
* jk/symbolic-ref-short: symbolic-ref --short: abbreviate the output unambiguously
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-symbolic-ref.txt7
1 files changed, 6 insertions, 1 deletions
diff --git a/Documentation/git-symbolic-ref.txt b/Documentation/git-symbolic-ref.txt
index a45d4c4f29..981d3a8fc1 100644
--- a/Documentation/git-symbolic-ref.txt
+++ b/Documentation/git-symbolic-ref.txt
@@ -8,7 +8,8 @@ git-symbolic-ref - Read and modify symbolic refs
SYNOPSIS
--------
[verse]
-'git symbolic-ref' [-q] [-m <reason>] <name> [<ref>]
+'git symbolic-ref' [-m <reason>] <name> <ref>
+'git symbolic-ref' [-q] [--short] <name>
DESCRIPTION
-----------
@@ -33,6 +34,10 @@ OPTIONS
symbolic ref but a detached HEAD; instead exit with
non-zero status silently.
+--short::
+ When showing the value of <name> as a symbolic ref, try to shorten the
+ value, e.g. from `refs/heads/master` to `master`.
+
-m::
Update the reflog for <name> with <reason>. This is valid only
when creating or updating a symbolic ref.