Commit graph

9 commits

Author SHA1 Message Date
Sorin Ionescu
969553349f Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
Conflicts:
	.gitignore
	lib/completion.zsh
	lib/git.zsh
	oh-my-zsh.sh
2011-04-30 16:57:47 -04:00
Kevin Daudt
7377ba3f7a Added git-flow plugin 2011-04-29 11:54:42 +02:00
Sorin Ionescu
6921a387f3 Populated custom. 2011-04-19 21:58:02 -04:00
Robin Ramael
77d05fe8ab Made git ignore everything in custom, not only the .zsh files. 2011-01-10 17:01:11 +01:00
James Cox
8a8a7bafa0 merge upstream 2009-09-23 16:14:04 +01:00
Robby Russell
19a08f15d6 not ignoring example.zsh 2009-09-23 08:05:05 -07:00
Robby Russell
ef9ce1e221 Updating .gitignore to ignore everything but the example.zsh file in custom/ 2009-09-23 08:03:38 -07:00
James Cox
93af38f154 further refactorings 2009-09-23 00:49:00 +01:00
Robby Russell
e20401e04e Adding initial gitignore file 2009-08-28 11:14:03 -07:00