Implement the feature suggested by Rich Mindwinter and Junio C Hamano (and following his advices) Allows git show/log commands to map author and committer names and emails using the mailmap file. Updates related to this second series: - All tests are successful after each patch - Use split_ident_line in shortlog.c - Documentation has been added to git-log.txt - Test has been added to check that we use the file - Lots of improvements in the way strbufs are used - New interface to map_user() - Bunch of other fixes git glog --committer/--author is still not looking for mailmap user names. Antoine Pelisse (7): Use split_ident_line to parse author and committer mailmap: Remove buffer length limit in map_user 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 Documentation/git-log.txt | 5 ++ builtin/blame.c | 189 +++++++++++++++++++++------------------------ builtin/log.c | 9 ++- builtin/shortlog.c | 53 ++++--------- commit.h | 1 + log-tree.c | 1 + mailmap.c | 56 ++++++-------- mailmap.h | 4 +- pretty.c | 111 ++++++++++++++------------ revision.h | 1 + t/t4203-mailmap.sh | 14 ++++ 11 files changed, 219 insertions(+), 225 deletions(-) -- 1.7.9.5 -- 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