This is a reroll of the previous series Antoine posted on Saturday. A new patch "string-list: allow case-insensitive string list" teaches the string-list API that some string lists can be sorted case insensitively (actually, you can feed any custom two string comparison functions). The string_list_lookup_extended() function introduced by the previous series has been discarded. Instead, the third patch "mailmap: remove email copy and length limitation" introduces a helper function that takes a <char *, size_t> key that is not NUL terminated to look for a matching item in a string list, and uses that to update map_user() function, together with the fourth patch "mailmap: simplify map_user() interface". All other patches are unmodified from Antoine's series (modulo wording tweaks here and there). Antoine Pelisse (9): 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 Junio C Hamano (1): string-list: allow case-insensitive string list 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 | 94 +++++++++++++++--------- mailmap.h | 4 +- pretty.c | 114 ++++++++++++++++------------- revision.c | 54 ++++++++++++++ revision.h | 1 + string-list.c | 17 ++++- string-list.h | 4 + t/t4203-mailmap.sh | 56 ++++++++++++++ 15 files changed, 379 insertions(+), 229 deletions(-) -- 1.8.1.304.gf036638 -- 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