linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2025-12-26 02:12:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'plugin-git' into merge

Browse source 
Conflicts:
	custom/aliases.zsh
	plugins/git/git-aliases.plugin.zsh
	plugins/git/git-prompt-old.plugin.zsh
	plugins/git/git-prompt.plugin.zsh
	plugins/git/git.plugin.zsh
	themes/ashleydev.zsh-theme
This commit is contained in:
Ashley Dev 2011-07-06 19:27:07 -07:00
commit 415bdbfe6d
135 changed files with 2170 additions and 1523 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/grep.zsh
View file

@ -1,4 +1,12 @@
if [[ "$DISABLE_COLOR" != "true" ]]; then
[[ -z "$GREP_OPTIONS" ]] && export GREP_OPTIONS='--color=auto'
[[ -z "$GREP_COLOR" ]] && export GREP_COLOR='1;32'
if [[ "$DISABLE_COLOR" != 'true' ]]; then
if [[ -z "$GREP_OPTIONS" ]]; then
export GREP_OPTIONS='--color=auto'
fi
if [[ -z "$GREP_COLOR" ]]; then
export GREP_COLOR="1;32"
fi
else
export GREP_OPTIONS='--color=none'
export GREP_COLOR=''
fi