git-diff: do not turn off -p/-M with any diff options.
authorJunio C Hamano <junkio@cox.net>
Wed, 30 Nov 2005 05:59:04 +0000 (21:59 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 30 Nov 2005 06:46:12 +0000 (22:46 -0800)
commit562051809589574576971c53c23aad93f8c395d9
treefa10b18d1546129bf73713b64fbc4a8feae3487f
parent069b20a198f171512a1d2d2163b40f70c94f5257
git-diff: do not turn off -p/-M with any diff options.

When the user gives a diff option (e.g. --cached) to "git diff",
we turned off the built-in default option -p, which is usually
not what user wants to see.

This commit makes lack of --name-status, --name-only nor -r to
add -p, and lack of -B*, -C* nor -M* to add -M to the flags
given to the underlying diff.

Signed-off-by: Junio C Hamano <junkio@cox.net>
git-diff.sh