dcarrillo/prezto
1
0
Fork 0
mirror of https://github.com/dcarrillo/prezto.git synced 2025-06-14 10:51:41 +00:00
Code Issues Releases Wiki Activity

[#149] Simplify diff, wdiff, make

Browse Source
This commit is contained in:
Sorin Ionescu
2012-06-03 17:53:02 -04:00
parent 45ab153c64
commit 761ba12813
3 changed files with 20 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
modules/utility/functions/diff
View File

@ -5,19 +5,15 @@
# Sorin Ionescu <sorin.ionescu@gmail.com>
#
if zstyle -t ':omz:module:utility:diff' color; then
function diff {
function diff {
if zstyle -t ':omz:module:utility:diff' color; then
if (( $+commands[colordiff] )); then
"$commands[diff]" --unified "$@" | colordiff --difftype diffu
command diff --unified "$@" | colordiff --difftype diffu
elif (( $+commands[git] )); then
git --no-pager diff --color=auto --no-ext-diff --no-index "$@"
else
"$commands[diff]" --unified "$@"
fi
}
else
unfunction diff
fi
diff --unified "$@"
else
command diff --unified "$@"
fi
}