]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 11cbda2 3080c50)
Merge branch 'js/diff-files-i-t-a-fix-for-difftool'
authorJunio C Hamano <gitster@pobox.com>
Tue, 7 Jul 2020 05:09:17 +0000 (22:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 7 Jul 2020 05:09:17 +0000 (22:09 -0700)
commit0ac0947b1470b2157fd4c085a1fd0b207d94b40b
tree51c2bb419ef22e3ac3309ebe6523e422e403b90ctree | snapshot
parent11cbda2add5d3eb7c415f1f6dd8186181a7f9874commit | diff
parent3080c5098049228cd561f08ee4cc31839251d579commit | diff
Merge branch 'js/diff-files-i-t-a-fix-for-difftool'

"git difftool" has trouble dealing with paths added to the index
with the intent-to-add bit.

* js/diff-files-i-t-a-fix-for-difftool:
  difftool -d: ensure that intent-to-add files are handled correctly
  diff-files --raw: show correct post-image of intent-to-add files
Unnamed repository; edit this file 'description' to name the repository.