Junio C Hamano 03761c922b 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"

2015-05-05 21:00:24 -07:00

2.1 KiB

Executable File

Raw Blame History

View Raw