From: Junio C Hamano <junkio@cox.net>
Date: Mon, 6 Feb 2006 00:37:18 +0000 (-0800)
Subject: git-diff: use --cc instead of -p.
X-Git-Tag: v1.2.0~59
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=df9892ffce46d1f1bd6fe64aa445be2ffe7346cf;p=git.git

git-diff: use --cc instead of -p.

The --cc output is much nicer when dealing with merges, so use
it by default.

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

diff --git a/git-diff.sh b/git-diff.sh
index 4812ae4c1..b7792a2db 100755
--- a/git-diff.sh
+++ b/git-diff.sh
@@ -22,13 +22,13 @@ case "$rev" in
 	esac
 esac
 
-# If we do not have --name-status, --name-only nor -r, default to -p.
+# 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.
 case " $flags " in
 *" '--name-status' "* | *" '--name-only' "* | *" '-r' "* )
 	;;
 *)
-	flags="$flags'-p' " ;;
+	flags="$flags'--cc' " ;;
 esac
 case " $flags " in
 *" '-"[BCM]* | *" '--find-copies-harder' "*)