Merge branch 'ap/log-mailmap'
commit577f63e781d2f9b9a6862389b6e9d2ca2467afa2
authorJunio C Hamano <gitster@pobox.com>
Mon, 21 Jan 2013 01:06:52 +0000 (20 17:06 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 21 Jan 2013 01:06:53 +0000 (20 17:06 -0800)
treeff7eb1668b21b118caa34a71fcde1026c0a932f4
parent02f55e660ccbd2fa1e3b2c686200f0037568f854
parentdf874fa82ef06c8c438b9a19c56c0b5eb089c012
Merge branch 'ap/log-mailmap'

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:
Documentation/config.txt
Documentation/git-log.txt
builtin/blame.c
builtin/log.c
builtin/shortlog.c
commit.h
log-tree.c
mailmap.c
pretty.c
revision.h
string-list.c
string-list.h
t/t4203-mailmap.sh