Merge branch 'qn/blame-show-email'
authorJunio C Hamano <gitster@pobox.com>
Wed, 24 Jun 2015 19:21:41 +0000 (12:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 24 Jun 2015 19:21:41 +0000 (12:21 -0700)
"git blame" learned blame.showEmail configuration variable.

* qn/blame-show-email:
blame: add blame.showEmail configuration

1  2 
builtin/blame.c
diff --cc builtin/blame.c
Simple merge