Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.textile
	lib/aliases.zsh
	templates/zshrc.zsh-template
	tools/install.sh
This commit is contained in:
Gaetan Semet 2014-03-14 16:50:51 +01:00
commit 4888217c85
72 changed files with 1261 additions and 915 deletions

View file

@ -97,15 +97,25 @@ You can install this via the command line with either `curl` or `wget`.
h4. via `curl`
@curl -L https://raw.github.com/stibbons/oh-my-zsh/master/tools/install.sh | sh@
@curl -L http://install.ohmyz.sh | sh@
h4. via `wget`
@wget --no-check-certificate https://raw.github.com/stibbons/oh-my-zsh/master/tools/install.sh -O - | sh@
@wget --no-check-certificate http://install.ohmyz.sh -O - | sh@
h4. Optional: change the install directory
The default location is `~/.oh-my-zsh` (hidden in your home directory).
You can change the install directory with the ZSH environment variable, either
by running `export ZSH=/your/path` before installing, or setting it before the
end of the install pipeline like this:
@curl -L https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh | ZSH=~/.dotfiles/zsh sh@
h3. The manual way
1. Clone the repository
@git clone git://github.com/stibbons/oh-my-zsh.git ~/.oh-my-zsh@
@ -118,7 +128,6 @@ h3. The manual way
@cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc@
4. Set zsh as your default shell:
@chsh -s /bin/zsh@
@ -129,6 +138,8 @@ h3. Problems?
You _might_ need to modify your PATH in ~/.zshrc if you're not able to find some commands after switching to _Oh My Zsh_.
If you installed manually or changed the install location, check ZSH in ~/.zshrc
h2. Usage
* enable the plugins you want in your @~/.zshrc@ (take a look at @plugins/@ to see what's possible)