|
|
@ -80,17 +80,27 @@ fi
|
|
|
|
|
|
|
|
|
|
|
|
# Diff/Make
|
|
|
|
# Diff/Make
|
|
|
|
if zstyle -t ':omz:alias:diff' color; then
|
|
|
|
if zstyle -t ':omz:alias:diff' color; then
|
|
|
|
|
|
|
|
function diff() {
|
|
|
|
if (( $+commands[colordiff] )); then
|
|
|
|
if (( $+commands[colordiff] )); then
|
|
|
|
alias diff='colordiff -u'
|
|
|
|
"$commands[diff]" --unified "$@" | colordiff --difftype diffu
|
|
|
|
compdef colordiff=diff
|
|
|
|
|
|
|
|
elif (( $+commands[git] )); then
|
|
|
|
elif (( $+commands[git] )); then
|
|
|
|
function diff() {
|
|
|
|
git --no-pager diff --color=auto --no-ext-diff --no-index "$@"
|
|
|
|
git --no-pager diff --color=always --no-ext-diff --no-index "$@";
|
|
|
|
else
|
|
|
|
|
|
|
|
"$commands[diff]" --unified "$@"
|
|
|
|
|
|
|
|
fi
|
|
|
|
}
|
|
|
|
}
|
|
|
|
compdef _git diff=git-diff
|
|
|
|
|
|
|
|
|
|
|
|
function wdiff() {
|
|
|
|
|
|
|
|
if (( $+commands[wdiff] )) && (( $+commands[colordiff] )); then
|
|
|
|
|
|
|
|
"$commands[diff]" --unified "$@" | "$commands[wdiff]" --diff-input --avoid-wraps | colordiff --difftype wdiff
|
|
|
|
|
|
|
|
elif (( $+commands[git] )); then
|
|
|
|
|
|
|
|
git --no-pager diff --color=auto --no-ext-diff --no-index --word-diff "$@"
|
|
|
|
|
|
|
|
elif (( $+commands[wdiff] )); then
|
|
|
|
|
|
|
|
"$commands[diff]" --unified "$@" | "$commands[wdiff]" --diff-input --avoid-wraps
|
|
|
|
else
|
|
|
|
else
|
|
|
|
alias diff='diff -u'
|
|
|
|
print "zsh: command not found: $0" >&2
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (( $+commands[colormake] )); then
|
|
|
|
if (( $+commands[colormake] )); then
|
|
|
|
alias make='colormake'
|
|
|
|
alias make='colormake'
|
|
|
|