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

diff --cc builtin/blame.c
Simple merge

diff --cc t/annotate-tests.sh
index 212bd605b5193d26c38efda3bb2ed9fd95b8b462,0eeeda3f3b164b86bb3d44693669d20c360565ca..d34208cc27623a6105f6b12f863c648429d2d34d
--- 1/t/annotate-tests.sh
--- 2/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' \