summaryrefslogtreecommitdiffstats
path: root/git-log.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-04-29 14:21:05 -0700
committerJunio C Hamano <gitster@pobox.com>2020-04-29 14:21:05 -0700
commit0dd50943c112dfc70367bd39eb3c88371db2518f (patch)
treef60fdfeafd48ad1b7c65220f044086e476422ecb /git-log.txt
parent67bf224a9fb3cd34ef712113c48f3144a9bc232a (diff)
downloadgit-htmldocs-0dd50943c112dfc70367bd39eb3c88371db2518f.tar.gz
Autogenerated HTML docs for v2.26.2-357-g86ab1
Diffstat (limited to 'git-log.txt')
-rw-r--r--git-log.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/git-log.txt b/git-log.txt
index bed09bb09..20e6d21a7 100644
--- a/git-log.txt
+++ b/git-log.txt
@@ -43,12 +43,16 @@ OPTIONS
If no `--decorate-refs` is given, pretend as if all refs were
included. For each candidate, do not use it for decoration if it
matches any patterns given to `--decorate-refs-exclude` or if it
- doesn't match any of the patterns given to `--decorate-refs`.
+ doesn't match any of the patterns given to `--decorate-refs`. The
+ `log.excludeDecoration` config option allows excluding refs from
+ the decorations, but an explicit `--decorate-refs` pattern will
+ override a match in `log.excludeDecoration`.
--source::
Print out the ref name given on the command line by which each
commit was reached.
+--[no-]mailmap::
--[no-]use-mailmap::
Use mailmap file to map author and committer names and email
addresses to canonical real names and email addresses. See