Merge branch 'jk/blame-fixes' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 31 Jan 2017 21:32:07 +0000 (13:32 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 31 Jan 2017 21:32:07 +0000 (13:32 -0800)
commit5fbb42a21ec6169328e081f7b475e4b56152c5b5
tree8a9d0fb8acdd08b1d1a3f6a8b3bf4e8a47c33cea
parentb1e4e1782f13da2a5160b6f35fe383f1e08ad7b6
parent4e768329847c8226a230406041fe249adea245cf
Merge branch 'jk/blame-fixes' into maint

"git blame --porcelain" misidentified the "previous" <commit, path>
pair (aka "source") when contents came from two or more files.

* jk/blame-fixes:
  blame: output porcelain "previous" header for each file
  blame: handle --no-abbrev
  blame: fix alignment with --abbrev=40
builtin/blame.c