dominic/prezto
1
0
Fork 0
Code Releases Activity

do not use git for recursive diff

Browse source
This commit is contained in:
Victor Volle 2015-02-21 09:40:42 +01:00
parent 88aee30ae8
commit ee0e3d3b8d
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
modules/utility/functions/diff
View file

@ -10,7 +10,15 @@ function diff {
if (( $+commands[colordiff] )); then
command diff --unified "$@" | colordiff --difftype diffu
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
command diff --unified "$@"
fi