Merge branch 'qn/blame-show-email' into next
commitb4998e2c1cb1c24d17e1a57b843061f51715d990
authorJunio C Hamano <gitster@pobox.com>
Thu, 11 Jun 2015 17:36:57 +0000 (11 10:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 11 Jun 2015 17:36:57 +0000 (11 10:36 -0700)
treed3425a290fcc0bd2b1f5d8effe0a49590e32f0a4
parent65b430887cf215e4d2a5704fdc493c1a80ed12fc
parent8b504db309c3b08e8ba7bd425a5fa29c29d8a4d5
Merge branch 'qn/blame-show-email' into next

"git blame" learned blame.showEmail configuration variable.

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