Merge branch 'kb/blame-author-email'
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)
* kb/blame-author-email:
  blame: Add option to show author email instead of name

Conflicts:
t/annotate-tests.sh

1  2 
builtin/blame.c
t/annotate-tests.sh

diff --cc builtin/blame.c
Simple merge
@@@ -38,8 -38,8 +38,8 @@@ test_expect_success 
      'prepare reference tree' \
      'echo "1A quick brown fox jumps over the" >file &&
       echo "lazy dog" >>file &&
 -     git add file
 +     git add file &&
-      GIT_AUTHOR_NAME="A" git commit -a -m "Initial."'
+      GIT_AUTHOR_NAME="A" GIT_AUTHOR_EMAIL="A@test.git" git commit -a -m "Initial."'
  
  test_expect_success \
      'check all lines blamed on A' \