X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-diff.sh;h=dc4d1b3cfd599138f0f25ed778121c273ed256c7;hb=687dd75c95f9212244b6cf4fe60b40db44de01ba;hp=b7792a2db3dac54adfd14835108bc36921bf04dc;hpb=df9892ffce46d1f1bd6fe64aa445be2ffe7346cf;p=git.git

diff --git a/git-diff.sh b/git-diff.sh
index b7792a2d..dc4d1b3c 100755
--- a/git-diff.sh
+++ b/git-diff.sh
@@ -22,14 +22,23 @@ case "$rev" in
 	esac
 esac
 
-# If we do not have --name-status, --name-only nor -r, default to --cc.
-# If we do not have -B nor -C, default to -M.
+# If we have -[123] --ours --theirs --base, don't do --cc by default.
 case " $flags " in
-*" '--name-status' "* | *" '--name-only' "* | *" '-r' "* )
+*" '-"[123]"' "* | *" '--ours' "* | *" '--base' "* | *" '--theirs' "*)
+	cc_or_p=-p ;;
+*)
+	cc_or_p=--cc ;;
+esac
+
+# If we do not have --name-status, --name-only, -r, or -c default to --cc.
+case " $flags " in
+*" '--name-status' "* | *" '--name-only' "* | *" '-r' "* | *" '-c' "* )
 	;;
 *)
-	flags="$flags'--cc' " ;;
+	flags="$flags'$cc_or_p' " ;;
 esac
+
+# If we do not have -B nor -C, default to -M.
 case " $flags " in
 *" '-"[BCM]* | *" '--find-copies-harder' "*)
 	;; # something like -M50.