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

8
README.textile
View file

@ -8,6 +8,7 @@ h2. Setup
h3. The automatic installer... (do you trust me?)
<<<<<<< HEAD
You can install this via the command line with either `curl` or `wget`.
h4. via `curl`
@ -17,13 +18,16 @@ h4. via `curl`
h4. via `wget`
@wget --no-check-certificate https://github.com/robbyrussell/oh-my-zsh/raw/master/tools/install.sh -O - | sh@
=======
@wget http://github.com/sjl/oh-my-zsh/raw/master/tools/install.sh -O - | sh@
>>>>>>> bd003653824bcff2231d20df783f239aff64b4b4
h3. The manual way
1. Clone the repository
@git clone git://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh@
@git clone git://github.com/sjl/oh-my-zsh.git ~/.oh-my-zsh@
2. Create a new zsh config by copying the zsh template we've provided.
@ -46,7 +50,7 @@ h2. Usage
* enable the plugins you want in your @~/.zshrc@ (take a look at @plugins/@ to see what's possible)
** example: @plugins=(git osx ruby)@
* Theme support: Change the @ZSH_THEME@ environment variable in @~/.zshrc@.
** Take a look at the "current themes":https://wiki.github.com/robbyrussell/oh-my-zsh/themes that come bundled with _Oh My Zsh_.
** Take a look at the "current themes":http://wiki.github.com/sjl/oh-my-zsh/themes that come bundled with _Oh My Zsh_.
* much much more... take a look at @lib/@ what _Oh My Zsh_ offers...
h2. Useful