Code

Merge branch 'kb/blame-author-email' into next
authorJunio C Hamano <gitster@pobox.com>
Wed, 17 Nov 2010 22:39:20 +0000 (14:39 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 17 Nov 2010 22:39:20 +0000 (14:39 -0800)
commit6fd6a2f109fa321f1f872fde2ae25c53931a9539
tree85a371a16f7476d567c6e0ce828661558da54ed1
parentb57a6cb8403a374f473f537d19686585e022e7ee
parent1b8cdce94f4fff2408f8ed26fe4fc2f187a46794
Merge branch 'kb/blame-author-email' into next

* 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