mirror of
https://github.com/samsonjs/config.git
synced 2026-03-25 09:15:47 +00:00
Use difft with git via GIT_EXTERNAL_DIFF instead of gitconfig
Sometimes tools don't pass --no-ext-diff and difft can be very slow and/or break tools that don't expect its output.
This commit is contained in:
parent
ae9b658f1c
commit
2044019e67
2 changed files with 4 additions and 1 deletions
|
|
@ -23,7 +23,6 @@
|
|||
[commit]
|
||||
verbose = true
|
||||
[diff]
|
||||
external = difft
|
||||
algorithm = histogram
|
||||
mnemonicprefix = true
|
||||
renames = copies
|
||||
|
|
|
|||
4
zshrc
4
zshrc
|
|
@ -85,6 +85,10 @@ else
|
|||
export VISUAL="vi"
|
||||
fi
|
||||
|
||||
if is_interactive && command_exists difft; then
|
||||
export GIT_EXTERNAL_DIFF="difft"
|
||||
fi
|
||||
|
||||
if mac; then
|
||||
# Don't pollute tar archives with ._ files (Apple double files)
|
||||
export COPYFILE_DISABLE=true
|
||||
|
|
|
|||
Loading…
Reference in a new issue