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 remote-tracking branch 'robbyrussell/master' into develop

Browse source 
Conflicts:
	.gitignore
	README.textile
	lib/aliases.zsh
	lib/functions.zsh
	lib/git.zsh
	lib/misc.zsh
	templates/zshrc.zsh-template
	tools/install.sh
This commit is contained in:
Shawn Sorichetti 2012-01-26 09:04:31 -05:00
commit ced4f4decc
111 changed files with 4273 additions and 378 deletions
Download patch file Download diff file Expand all files Collapse all files

8
.gitignore vendored
View file

@ -1,9 +1,9 @@
locals.zsh
log/.zsh_history
projects.zsh
custom
custom/*.zsh
*.un~
custom/*
!custom/example
!custom/example.zsh
cache
*.swp
.DS_Store