Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
git-diff: use --cc instead of -p.
author
Junio C Hamano
<junkio@cox.net>
Mon, 6 Feb 2006 00:37:18 +0000
(16:37 -0800)
committer
Junio C Hamano
<junkio@cox.net>
Mon, 6 Feb 2006 00:37:18 +0000
(16:37 -0800)
The --cc output is much nicer when dealing with merges, so use
it by default.
Signed-off-by: Junio C Hamano <junkio@cox.net>
git-diff.sh
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
4abd896
)
diff --git
a/git-diff.sh
b/git-diff.sh
index 4812ae4c1ff937ded49334a97ee1dc2c1732e433..b7792a2db3dac54adfd14835108bc36921bf04dc 100755
(executable)
--- 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' "*)