X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-diff.sh;h=dc0dd312bfb83921e1c52849a23ece84a05b5ecd;hb=5941a9e9d882b12dcc2a80e55acb25c180475529;hp=4812ae4c1ff937ded49334a97ee1dc2c1732e433;hpb=92811b57674ce81e0d7fa1cfeca44023bc650641;p=git.git

diff --git a/git-diff.sh b/git-diff.sh
index 4812ae4c..dc0dd312 100755
--- a/git-diff.sh
+++ b/git-diff.sh
@@ -22,16 +22,25 @@ case "$rev" in
 	esac
 esac
 
-# If we do not have --name-status, --name-only nor -r, default to -p.
-# 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'-p' " ;;
+	flags="$flags'$cc_or_p' " ;;
 esac
+
+# If we do not have -B, -C, -r, nor -p, default to -M.
 case " $flags " in
-*" '-"[BCM]* | *" '--find-copies-harder' "*)
+*" '-"[BCMrp]* | *" '--find-copies-harder' "*)
 	;; # something like -M50.
 *)
 	flags="$flags'-M' " ;;