aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/git-log.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-05-08 22:36:14 -0700
committerJunio C Hamano <gitster@pobox.com>2010-05-08 22:36:14 -0700
commit72d9b222a940c93a8d915c26a4d5d077e23be871 (patch)
treeb1bfaf4991ee3edf1410ef4e5dff3a5475746795 /Documentation/git-log.txt
parente251a7b34a85b0ac8a63a31e899e070ea2a330c7 (diff)
parent4f62c2bc577bbb85b65f3261c7fab7ef74def4cd (diff)
downloadgit-72d9b222a940c93a8d915c26a4d5d077e23be871.tar.gz
Merge branch 'sd/log-decorate'
* sd/log-decorate: log.decorate: only ignore it under "log --pretty=raw" script with rev-list instead of log log --pretty/--oneline: ignore log.decorate log.decorate: usability fixes Add `log.decorate' configuration variable. git_config_maybe_bool() Conflicts: builtin/log.c
Diffstat (limited to 'Documentation/git-log.txt')
-rw-r--r--Documentation/git-log.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index fb184ba186..57aa574675 100644
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -37,7 +37,8 @@ include::diff-options.txt[]
and <until>, see "SPECIFYING REVISIONS" section in
linkgit:git-rev-parse[1].
---decorate[=short|full]::
+--no-decorate::
+--decorate[=short|full|no]::
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