mirror of
https://github.com/dcarrillo/prezto.git
synced 2024-12-23 04:28:00 +00:00
Use Git for coloured diff if colordiff is not installed.
This commit is contained in:
parent
7bf23fd6d2
commit
0ccc0c3fe6
@ -63,11 +63,20 @@ fi
|
||||
|
||||
if [[ "$DISABLE_COLOR" != 'true' ]]; 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
|
||||
|
||||
if [[ -x "${commands[colormake]}" ]]; then
|
||||
alias make='colormake'
|
||||
compdef colormake=make
|
||||
fi
|
||||
fi
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user