| commit | 85440847d658640895e4512ddc7d68808847ce64 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 10 Jan 2013 22:40:47 +0000 (10 14:40 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 10 Jan 2013 22:40:48 +0000 (10 14:40 -0800) | ||
| tree | 8a9fc936c92ba8e45040280e5f9a9fd691071ef6 | treesnapshot (tar.gz zip) |
| parent | a8b3ba5cdd1bc56c0672da899fef0c648049ec3c | commitdiff |
| parent | df874fa82ef06c8c438b9a19c56c0b5eb089c012 | commitdiff |
Merge branch 'ap/log-mailmap' into next
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
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
13 files changed: