summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-02-06 00:37:18 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-02-06 00:37:18 (GMT)
commitdf9892ffce46d1f1bd6fe64aa445be2ffe7346cf (patch)
treee842e14e04b504cebdb1808ec48219dcbda9bcfd
parent4abd89648eb40384556e2118e74be03325d0b05d (diff)
downloadgit-df9892ffce46d1f1bd6fe64aa445be2ffe7346cf.zip
git-df9892ffce46d1f1bd6fe64aa445be2ffe7346cf.tar.gz
git-df9892ffce46d1f1bd6fe64aa445be2ffe7346cf.tar.bz2
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>
-rwxr-xr-xgit-diff.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-diff.sh b/git-diff.sh
index 4812ae4..b7792a2 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' "*)