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

Conflict merge 1

Browse source
This commit is contained in:
Preston Davis 2015-10-31 06:26:30 -04:00
commit 4d4fd1ba97
19 changed files with 1371 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

12
README.markdown
View file

@ -25,6 +25,7 @@ Oh My Zsh is installed by running one of the following commands in your terminal
#### via curl
<<<<<<< HEAD
```shell
sh -c "$(curl -fsSL https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"
```
@ -34,6 +35,13 @@ sh -c "$(curl -fsSL https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/i
```shell
sh -c "$(wget https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh -O -)"
```
=======
`sh -c "$(curl -fsSL https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"`
#### via wget
`sh -c "$(wget https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh -O -)"`
>>>>>>> c0134a9450e486251b247735e022d7efeb496b9c
## Using Oh My Zsh
@ -104,7 +112,11 @@ The default location is `~/.oh-my-zsh` (hidden in your home directory)
If you'd like to change the install directory with the `ZSH` environment variable, either by running `export ZSH=/your/path` before installing, or by setting it before the end of the install pipeline like this:
```shell
<<<<<<< HEAD
export ZSH="~/.dotfiles/oh-my-zsh"; sh -c "$(curl -fsSL https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"
=======
curl -L https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh | ZSH=~/.dotfiles/zsh sh
>>>>>>> c0134a9450e486251b247735e022d7efeb496b9c
```
#### Manual Installation