]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0f650e1 4e76832)
Merge branch 'jk/blame-fixes'
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Jan 2017 23:12:13 +0000 (15:12 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Jan 2017 23:12:13 +0000 (15:12 -0800)
"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

1  2 
builtin/blame.c patch | diff1 | diff2 | blob | history

diff --cc builtin/blame.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.