Junio C Hamano f22fd75c6a git-diff: do not fall back on --cc when -[123], --ours etc. are given. ...

These flags ask diff with a specific unmerged stage, so it
should fall back on -p instead.  Also when -c is given, we
should not do --cc.

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

2006-02-06 11:22:07 -08:00

1.5 KiB

Executable File

Raw Blame History

View Raw