diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-01-20 17:06:52 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-20 17:06:53 -0800 |
| commit | 577f63e781d2f9b9a6862389b6e9d2ca2467afa2 (patch) | |
| tree | ff7eb1668b21b118caa34a71fcde1026c0a932f4 /Documentation/config.txt | |
| parent | 02f55e660ccbd2fa1e3b2c686200f0037568f854 (diff) | |
| parent | df874fa82ef06c8c438b9a19c56c0b5eb089c012 (diff) | |
| download | git-577f63e781d2f9b9a6862389b6e9d2ca2467afa2.tar.gz | |
Merge branch 'ap/log-mailmap'
Teach commands in the "log" family to optionally pay attention to
the mailmap.
* ap/log-mailmap:
log --use-mailmap: optimize for cases without --author/--committer search
log: add log.mailmap configuration option
log: grep author/committer using mailmap
test: add test for --use-mailmap option
log: add --use-mailmap option
pretty: use mailmap to display username and email
mailmap: add mailmap structure to rev_info and pp
mailmap: simplify map_user() interface
mailmap: remove email copy and length limitation
Use split_ident_line to parse author and committer
string-list: allow case-insensitive string list
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index ef45c99e53..5ecb0fccb1 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1525,6 +1525,10 @@ log.showroot:: Tools like linkgit:git-log[1] or linkgit:git-whatchanged[1], which normally hide the root commit will now show it. True by default. +log.mailmap:: + If true, makes linkgit:git-log[1], linkgit:git-show[1], and + linkgit:git-whatchanged[1] assume `--use-mailmap`. + mailmap.file:: The location of an augmenting mailmap file. The default mailmap, located in the root of the repository, is loaded |