Commit Graph

5 Commits

Author SHA1 Message Date
Sorin Ionescu
ba9900a488 Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
Conflicts:
	.gitignore
	lib/aliases.zsh
	lib/completion.zsh
	lib/functions.zsh
	lib/git.zsh
	lib/key-bindings.zsh
	lib/misc.zsh
	lib/spectrum.zsh
	plugins/git/git.plugin.zsh
	plugins/osx/_man-preview
	plugins/osx/osx.plugin.zsh
	plugins/svn/svn.plugin.zsh
	templates/zshrc.zsh-template
	themes/lukerandall.zsh-theme
	themes/philips.zsh-theme
	tools/upgrade.sh
2011-08-26 02:58:19 -04:00
Hakan Ensari
8a385329b7 Rails 3 aliases now work with Rails 2 as well. 2011-04-29 10:59:59 +01:00
Tadas Tamošauskas
843f0a7ea5 fixed typo in rails3 plugin and added one alias for migrating and redoing migration if it was successful 2011-02-13 11:05:12 +00:00
Hakan Ensari
14628eef37 Removed remote_console. It doesn't handle rvm, capistrano, and so on. 2010-12-20 12:50:55 -03:00
Hakan Ensari
7eeb7d5ea7 A rails3 plugin based on the rails plugin 2010-12-20 12:19:59 -03:00