undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

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

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2006-02-05 16:37:18 -08:00
parent 4abd89648e
commit df9892ffce
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git-diff.sh
View File

@ -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' "*)