Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Oh My Zsh
Commits
d0d01c0b
Commit
d0d01c0b
authored
Jul 06, 2020
by
Marc Cornellà
Browse files
lib: prefix diff call with command to bypass diff aliases
See
https://github.com/ohmyzsh/ohmyzsh/pull/8807#issuecomment-652697704
parent
fd9781b4
Changes
1
Show whitespace changes
Inline
Side-by-side
lib/theme-and-appearance.zsh
View file @
d0d01c0b
...
@@ -40,7 +40,7 @@ if [[ "$DISABLE_LS_COLORS" != "true" ]]; then
...
@@ -40,7 +40,7 @@ if [[ "$DISABLE_LS_COLORS" != "true" ]]; then
fi
fi
# enable diff color if possible.
# enable diff color if possible.
if
diff
--color
.
.
&>/dev/null
;
then
if
command
diff
--color
.
.
&>/dev/null
;
then
alias
diff
=
'diff --color'
alias
diff
=
'diff --color'
fi
fi
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment