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>
Junio C Hamano committed
Feb 5, 2006 at 16:37 UTC
df9892ffce46d1f1bd6fe64aa445be2ffe7346cf
1 file changed
+2
-2
git-diff.sh
+2
-2
@@ -22,13 +22,13 @@ case "$rev" in
22
esac
23
esac
24
25
-# If we do not have --name-status, --name-only nor -r, default to -p.
25
+# If we do not have --name-status, --name-only nor -r, default to --cc.
26
# If we do not have -B nor -C, default to -M.
27
case " $flags " in
28
*" '--name-status' "* | *" '--name-only' "* | *" '-r' "* )
29
;;
30
*)
31
- flags="$flags'-p' " ;;
31
+ flags="$flags'--cc' " ;;
32
esac
33
case " $flags " in
34
*" '-"[BCM]* | *" '--find-copies-harder' "*)