diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-07-06 22:09:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-07-06 22:09:17 -0700 |
| commit | 0ac0947b1470b2157fd4c085a1fd0b207d94b40b (patch) | |
| tree | 51c2bb419ef22e3ac3309ebe6523e422e403b90c /commit.c | |
| parent | Merge branch 'js/default-branch-name' (diff) | |
| parent | difftool -d: ensure that intent-to-add files are handled correctly (diff) | |
| download | git-0ac0947b1470b2157fd4c085a1fd0b207d94b40b.tar.gz git-0ac0947b1470b2157fd4c085a1fd0b207d94b40b.zip | |
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 'commit.c')
0 files changed, 0 insertions, 0 deletions