Merge branch 'kb/blame-author-email'
commit4ef927a995d9b54b37e4cff8ed7cd92764d4dacd
authorJunio C Hamano <gitster@pobox.com>
Tue, 30 Nov 2010 01:52:32 +0000 (29 17:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 30 Nov 2010 01:52:32 +0000 (29 17:52 -0800)
tree72ae07b6893c4d81b899b757f413be7534565706
parent039e84e30d38f51d68ab465bfae32ba8058b51a0
parent1b8cdce94f4fff2408f8ed26fe4fc2f187a46794
Merge branch 'kb/blame-author-email'

* kb/blame-author-email:
  blame: Add option to show author email instead of name

Conflicts:
t/annotate-tests.sh
builtin/blame.c
t/annotate-tests.sh