Merge branch 'ap/log-mailmap'
authorJunio C Hamano <gitster@pobox.com>
Mon, 21 Jan 2013 01:06:52 +0000 (17:06 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 21 Jan 2013 01:06:53 +0000 (17:06 -0800)
commit577f63e...81d2f9b9a6862389b6e9d2ca2467afa2
treeff7eb16...8b21b118caa34a71fcde1026c0a932f4copy hash to clipboard (tree)
parent02f55e6...0ccbd2fa1e3b2c686200f0037568f854copy hash to clipboard (diff)
parentdf874fa...2ef06c8c438b9a19c56c0b5eb089c012copy hash to clipboard (diff)
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