Merge branch 'jk/blame-fixes' into next
authorJunio C Hamano <gitster@pobox.com>
Tue, 10 Jan 2017 23:27:31 +0000 (15:27 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 10 Jan 2017 23:27:31 +0000 (15:27 -0800)
commit18f909da614a7ffa1d967aafb81fb71b8a6ab6bc
tree9db40f4fc0bd8d549fee00bf6d7fa38836ba6e5b
parentac42e4958ca1477fa6f58c2ddaf57ea68d4131d5
parent4e768329847c8226a230406041fe249adea245cf
Merge branch 'jk/blame-fixes' into next

"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