From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 17 Nov 2010 22:39:20 +0000 (-0800)
Subject: Merge branch 'kb/blame-author-email' into next
X-Git-Tag: ko-next~141
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6fd6a2f109fa321f1f872fde2ae25c53931a9539;p=git.git

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
---

6fd6a2f109fa321f1f872fde2ae25c53931a9539
diff --cc t/annotate-tests.sh
index 212bd605b,0eeeda3f3..d34208cc2
--- a/t/annotate-tests.sh
+++ b/t/annotate-tests.sh
@@@ -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' \