Merge branch 'jk/blame-fixes'
commit256d3dabbd04d4b35d36a68ef0633a4e6e7a07fa
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Jan 2017 23:12:13 +0000 (18 15:12 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Jan 2017 23:12:13 +0000 (18 15:12 -0800)
tree2594758b36a925cd14cb79313bd1b97376d5d005
parent0f650e1479c99e21ffb11bb5906a3abe55081a9b
parent4e768329847c8226a230406041fe249adea245cf
Merge branch 'jk/blame-fixes'

"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