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

Merge SJL's fork with upstream

Browse source 
Merge branch 'master' of https://github.com/sjl/oh-my-zsh

Conflicts:
	README.textile
	lib/git.zsh
	oh-my-zsh.sh
This commit is contained in:
Jeffrey Horn 2012-01-19 14:27:51 -05:00
commit 7bebacbb87
26 changed files with 1310 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tools/install.sh
View file

@ -5,7 +5,7 @@ then
fi
echo "\033[0;34mCloning Oh My Zsh...\033[0m"
/usr/bin/env git clone https://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh
/usr/bin/env git clone git://github.com/sjl/oh-my-zsh.git ~/.oh-my-zsh
echo "\033[0;34mLooking for an existing zsh config...\033[0m"
if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]