Hi, Here is a reroll of ap/log-mailmap. The idea is to use another preparatory step: Allow case-insensitive and length search in list_lookup We can now search for mapping name and email without any copy. Of course a copy is then necessary to store the info, but we no longer need any copy to look-up the mapping (useful for replacing or not before grep). Thanks, Antoine Pelisse (10): list_lookup: create case and length search Use split_ident_line to parse author and committer mailmap: remove email copy and length limitation mailmap: simplify map_user() interface mailmap: add mailmap structure to rev_info and pp pretty: use mailmap to display username and email log: add --use-mailmap option test: add test for --use-mailmap option log: grep author/committer using mailmap log: add log.mailmap configuration option Documentation/config.txt | 4 + Documentation/git-log.txt | 5 ++ builtin/blame.c | 183 ++++++++++++++++++++++------------------------ builtin/log.c | 16 +++- builtin/shortlog.c | 54 ++++---------- commit.h | 1 + log-tree.c | 1 + mailmap.c | 55 +++++--------- mailmap.h | 4 +- pretty.c | 114 ++++++++++++++++------------- revision.c | 54 ++++++++++++++ revision.h | 1 + string-list.c | 30 ++++++-- string-list.h | 2 + t/t4203-mailmap.sh | 56 ++++++++++++++ 15 files changed, 349 insertions(+), 231 deletions(-) -- 1.7.12.4.3.g2036a08.dirty -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html