|
|
@ -10,6 +10,11 @@ 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
|
|
|
|
|
|
|
|
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 "$@"
|
|
|
|
git --no-pager diff --color=auto --no-ext-diff --no-index "$@"
|
|
|
|
else
|
|
|
|
else
|
|
|
|
command diff --unified "$@"
|
|
|
|
command diff --unified "$@"
|
|
|
@ -17,6 +22,9 @@ function diff {
|
|
|
|
else
|
|
|
|
else
|
|
|
|
command diff --unified "$@"
|
|
|
|
command diff --unified "$@"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
command diff --unified "$@"
|
|
|
|
|
|
|
|
fi
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
diff "$@"
|
|
|
|
diff "$@"
|
|
|
|