commit | cd0120857b8112258cef72c0f5adb7f8e8df7c1c | [log] [tgz] |
---|---|---|
author | Junio C Hamano <gitster@pobox.com> | Mon May 11 14:34:00 2015 -0700 |
committer | Junio C Hamano <gitster@pobox.com> | Mon May 11 14:34:00 2015 -0700 |
tree | 2cf282edb0f888f3bd71372941590d3393b58a35 | |
parent | 1add9aed85674c2396a2a50cd4cd5548db32ac4f [diff] | |
parent | 06151739988601b0fe6179c6c67a0031b85b536f [diff] |
Merge branch 'jc/diff-no-index-d-f' into maint-2.3 The usual "git diff" when seeing a file turning into a directory showed a patchset to remove the file and create all files in the directory, but "git diff --no-index" simply refused to work. Also, when asked to compare a file and a directory, imitate POSIX "diff" and compare the file with the file with the same name in the directory, instead of refusing to run. * jc/diff-no-index-d-f: diff-no-index: align D/F handling with that of normal Git diff-no-index: DWIM "diff D F" into "diff D/F F"