From df9892ffce46d1f1bd6fe64aa445be2ffe7346cf Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 5 Feb 2006 16:37:18 -0800 Subject: [PATCH] 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 --- git-diff.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git-diff.sh b/git-diff.sh index 4812ae4c..b7792a2d 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' "*) -- 2.11.0