Imported Upstream version 2.27.0

[platform/upstream/git.git] / Documentation / git-log.txt

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index bed09bb..20e6d21 100644 (file)
--- a/Documentation/git-log.txt
+++ b/Documentation/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