diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-11-30 08:59:04 +0300 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-30 09:46:12 +0300 |
| commit | 562051809589574576971c53c23aad93f8c395d9 (patch) | |
| tree | fa10b18d1546129bf73713b64fbc4a8feae3487f /git-merge-one-file.sh | |
| parent | 069b20a198f171512a1d2d2163b40f70c94f5257 (diff) | |
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>
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions