diff options
| author |  Antoine Pelisse <apelisse@gmail.com> | 2013-01-05 22:26:46 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-01-10 12:33:09 -0800 |
| commit | e6bb5f78fb351c89a80826befda3c8f06f91f249 (patch) | |
| tree | ea285a8ab9c048ba30cf524e85caddde4c12acf8 /Documentation | |
| parent | log: grep author/committer using mailmap (diff) | |
| download | tgif-e6bb5f78fb351c89a80826befda3c8f06f91f249.tar.xz | |
log: add log.mailmap configuration option
Teach "log.mailmap" configuration variable to turn "--use-mailmap"
option on to "git log", "git show" and "git whatchanged".
The "--no-use-mailmap" option from the command line can countermand
the setting.
Signed-off-by: Antoine Pelisse <apelisse@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
| -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 bf8f911e1f..226362a0ea 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1509,6 +1509,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 |