From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 6 May 2015 04:00:24 +0000 (-0700)
Subject: Merge branch 'jc/diff-no-index-d-f'
X-Git-Tag: v2.5.0-rc0~160
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=03761c922bf938ae4d22c62eda712c8ff0c1a8d7;p=git

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"
---

03761c922bf938ae4d22c62eda712c8ff0c1a8d7