dcarrillo/prezto
1
0
Fork 0
mirror of https://github.com/dcarrillo/prezto.git synced 2024-12-23 09:08:00 +00:00
Code Issues Releases Wiki Activity

Use Git for coloured diff if colordiff is not installed.

Browse Source
This commit is contained in:
Sorin Ionescu 2011-07-14 16:19:00 -04:00
parent 7bf23fd6d2
commit 0ccc0c3fe6
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
functions/alias.zsh
View File

@ -63,11 +63,20 @@ fi
if [[ "$DISABLE_COLOR" != 'true' ]]; then if [[ "$DISABLE_COLOR" != 'true' ]]; then
if [[ -x "${commands[colordiff]}" ]]; then if [[ -x "${commands[colordiff]}" ]]; then
alias diff='colordiff' alias diff='colordiff -u'
compdef colordiff=diff
elif [[ -x "${commands[git]}" ]]; then
function diff() {
git --no-pager diff --color=always --no-ext-diff --no-index "$@";
}
compdef _git diff=git-diff
else
alias diff='diff -u'
fi fi
if [[ -x "${commands[colormake]}" ]]; then if [[ -x "${commands[colormake]}" ]]; then
alias make='colormake' alias make='colormake'
compdef colormake=make
fi fi
fi fi