2012-06-03 14:16:47 -04:00
|
|
|
#
|
|
|
|
# Highlights diff output.
|
|
|
|
#
|
|
|
|
# Authors:
|
|
|
|
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
|
|
|
#
|
|
|
|
|
2012-06-03 17:53:02 -04:00
|
|
|
function diff {
|
2012-09-03 16:08:39 -04:00
|
|
|
if zstyle -t ':prezto:module:utility:diff' color; then
|
2012-06-03 14:16:47 -04:00
|
|
|
if (( $+commands[colordiff] )); then
|
2012-06-03 17:53:02 -04:00
|
|
|
command diff --unified "$@" | colordiff --difftype diffu
|
2012-06-03 14:16:47 -04:00
|
|
|
elif (( $+commands[git] )); then
|
2015-02-21 09:40:42 +01:00
|
|
|
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
|
2012-06-13 14:08:57 -04:00
|
|
|
else
|
|
|
|
command diff --unified "$@"
|
2012-06-03 14:16:47 -04:00
|
|
|
fi
|
2012-06-03 17:53:02 -04:00
|
|
|
else
|
|
|
|
command diff --unified "$@"
|
|
|
|
fi
|
|
|
|
}
|
2012-06-03 14:16:47 -04:00
|
|
|
|
2012-06-13 12:34:06 -04:00
|
|
|
diff "$@"
|