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

Rework diff function

Browse Source 
This removes --unified from the default options to make it possible to pass -y
without worrying about conflicting output formats.

diffu has also been added as an alias to make it easier to get output as a
unified diff.

Fixes #1231
This commit is contained in:
Kaleb Elwert 2017-04-15 14:06:05 -07:00
parent 40853f23c2
commit 38f0d2f34e
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/utility/functions/diff
View File

@ -8,14 +8,12 @@
function diff { function diff {
if zstyle -t ':prezto:module:utility:diff' color; then if zstyle -t ':prezto:module:utility:diff' color; then
if (( $+commands[colordiff] )); then if (( $+commands[colordiff] )); then
command colordiff --unified "$@" command colordiff "$@"
elif (( $+commands[git] )); then
git --no-pager diff --color=auto --no-ext-diff --no-index "$@"
else else
command diff --unified "$@" command diff "$@"
fi fi
else else
command diff --unified "$@" command diff "$@"
fi fi
} }

1
modules/utility/init.zsh
View File

@ -49,6 +49,7 @@ alias sftp='noglob sftp'
alias _='sudo' alias _='sudo'
alias b='${(z)BROWSER}' alias b='${(z)BROWSER}'
alias cp="${aliases[cp]:-cp} -i" alias cp="${aliases[cp]:-cp} -i"
alias diffu="diff --unified"
alias e='${(z)VISUAL:-${(z)EDITOR}}' alias e='${(z)VISUAL:-${(z)EDITOR}}'
alias ln="${aliases[ln]:-ln} -i" alias ln="${aliases[ln]:-ln} -i"
alias mkdir="${aliases[mkdir]:-mkdir} -p" alias mkdir="${aliases[mkdir]:-mkdir} -p"