Implement the feature suggested here [1] by Rich Mindwinter and Junio C Hamano (and following his advices) This is a pre-version so there are a bunch of things still missing, among them: - There is no tests - Grep search for mailmap author/committer is not available - There is no documentation of the new option [1]: http://thread.gmane.org/gmane.comp.version-control.git/211270 Antoine Pelisse (5): Use split_ident_line to parse author and committer mailmap: Remove buffer length limit in map_user mailmap: Add mailmap structure to rev_info and pp pretty: Use mailmap to display username and email log: Add --use-mailmap option builtin/blame.c | 59 +++++++++++++++++------------------------------- builtin/log.c | 9 +++++++- commit.h | 1 + log-tree.c | 1 + mailmap.c | 16 ++++++------- pretty.c | 70 ++++++++++++++++++++++++++++++++++++--------------------- revision.h | 1 + 7 files changed, 84 insertions(+), 73 deletions(-) -- 1.8.1.rc1.5.g7e0651a -- 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