1
0
Fork 0

do not use git for recursive diff

pull/814/head
Victor Volle 10 years ago
parent 88aee30ae8
commit ee0e3d3b8d

@ -10,7 +10,15 @@ function diff {
if (( $+commands[colordiff] )); then if (( $+commands[colordiff] )); then
command diff --unified "$@" | colordiff --difftype diffu command diff --unified "$@" | colordiff --difftype diffu
elif (( $+commands[git] )); then elif (( $+commands[git] )); then
git --no-pager diff --color=auto --no-ext-diff --no-index "$@" local diffr=0
for x; do
if [ "$x" = '-r' ]; then diffr=1; fi
done
if [ $diffr -eq 0 ]; then
git --no-pager diff --color=auto --no-ext-diff --no-index "$@"
else
command diff --unified "$@"
fi
else else
command diff --unified "$@" command diff --unified "$@"
fi fi

Loading…
Cancel
Save