summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-08-25 14:46:12 -0700
committerJunio C Hamano <gitster@pobox.com>2009-08-25 14:46:12 -0700
commitd6d994d9115ee7ce5bb5ffcfb75fea838174b9c4 (patch)
tree5c5c94d5853acf90d9e379de637c7b21ba5dc92f /Documentation
parentb91069ae9a6cb2d92fa6a5ed6d258bed530abcc7 (diff)
parent33e7018c459e6583b899690cabd21c808ffd3c85 (diff)
downloadgit-d6d994d9115ee7ce5bb5ffcfb75fea838174b9c4.tar.gz
Merge branch 'lh/short-decorate'
* lh/short-decorate: git-log: allow --decorate[=short|full]
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-log.txt8
1 files changed, 6 insertions, 2 deletions
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 34cf4e5811..3d79de11ec 100644
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -37,8 +37,12 @@ include::diff-options.txt[]
and <until>, see "SPECIFYING REVISIONS" section in
linkgit:git-rev-parse[1].
---decorate::
- Print out the ref names of any commits that are shown.
+--decorate[=short|full]::
+ Print out the ref names of any commits that are shown. If 'short' is
+ specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and
+ 'refs/remotes/' will not be printed. If 'full' is specified, the
+ full ref name (including prefix) will be printed. The default option
+ is 'short'.
--source::
Print out the ref name given on the command line by which each