diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-01-31 13:32:07 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-31 13:32:07 -0800 |
| commit | 5fbb42a21ec6169328e081f7b475e4b56152c5b5 (patch) | |
| tree | 8a9d0fb8acdd08b1d1a3f6a8b3bf4e8a47c33cea /t/t6024-recursive-merge.sh | |
| parent | Merge branch 'jk/archive-zip-userdiff-config' into maint (diff) | |
| parent | blame: output porcelain "previous" header for each file (diff) | |
| download | tgif-5fbb42a21ec6169328e081f7b475e4b56152c5b5.tar.xz | |
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
Diffstat (limited to 't/t6024-recursive-merge.sh')
0 files changed, 0 insertions, 0 deletions