summaryrefslogtreecommitdiff
path: root/ci/config
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-07-06 22:09:17 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-07-06 22:09:17 -0700
commit0ac0947b1470b2157fd4c085a1fd0b207d94b40b (patch)
tree51c2bb419ef22e3ac3309ebe6523e422e403b90c /ci/config
parentMerge branch 'js/default-branch-name' (diff)
parentdifftool -d: ensure that intent-to-add files are handled correctly (diff)
downloadtgif-0ac0947b1470b2157fd4c085a1fd0b207d94b40b.tar.xz
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
Diffstat (limited to 'ci/config')
0 files changed, 0 insertions, 0 deletions