diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-05-05 21:00:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-05 21:00:24 -0700 |
| commit | 03761c922bf938ae4d22c62eda712c8ff0c1a8d7 (patch) | |
| tree | d4e6edbb75278ea54e2c5b285961227bdf09ded9 /aclocal.m4 | |
| parent | a916cb5fb4824322d7e99b1b0efad4e6d7850e78 (diff) | |
| parent | 06151739988601b0fe6179c6c67a0031b85b536f (diff) | |
| download | git-03761c922bf938ae4d22c62eda712c8ff0c1a8d7.tar.gz git-03761c922bf938ae4d22c62eda712c8ff0c1a8d7.tar.xz | |
Merge branch 'jc/diff-no-index-d-f'
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"
Diffstat (limited to 'aclocal.m4')
0 files changed, 0 insertions, 0 deletions