This repository has been archived on 2022-03-28. You can view files and clone it, but cannot push or open issues or pull requests.

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

..

ant

fix double -f and corrected format.

2011-05-31 14:16:43 +02:00

apache2-macports

Added start/stop aliases for Apache 2 installation via macports.

2011-04-20 15:54:51 +02:00

archive

Renamed extract plugin to archive.

2011-07-28 18:07:34 -04:00

archlinux

Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh

2011-08-26 02:58:19 -04:00

autojump

Add autojump plugin

2011-05-19 16:20:30 +02:00

brew

Rollback of Pull #366

2011-05-30 10:07:15 -04:00

bundler

Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh

2011-08-26 02:58:19 -04:00

cake

Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh

2011-08-26 02:58:19 -04:00

cap

Cleanup

2011-05-28 13:06:03 -04:00

cloudapp

Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh

2011-08-26 02:58:19 -04:00

command-not-found

command-not-found package in ubuntu

2010-10-25 16:02:16 -05:00

compleat

Added helper functions.

2011-07-28 16:41:39 -04:00

cpanm

Optimize plugin loading so that only one call to compinit is required

2011-04-12 17:41:09 -04:00

deb

added alias for apt-cache search

2011-04-26 23:22:42 +02:00

debian

Add debian plugins file

2011-03-15 20:31:14 -04:00

dirpersist

Cleaned up lib/ and removed trailing white space everywhere.

2011-06-01 02:48:26 -04:00

django

Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh

2011-08-26 02:58:19 -04:00

gas

Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh

2011-08-26 02:58:19 -04:00

gem

Optimize plugin loading so that only one call to compinit is required

2011-04-12 17:41:09 -04:00

git

Added helper functions.

2011-07-28 16:41:39 -04:00

git-flow

Cleaned up lib/ and removed trailing white space everywhere.

2011-06-01 02:48:26 -04:00

github

Cleanup

2011-05-28 13:06:03 -04:00

gnu-utils

Fixed minor bugs in gnu-utils plugin.

2011-07-28 19:34:21 -04:00

gpg-agent

Added gpg-agent plugin

2010-10-15 16:50:39 +02:00

heroku

Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh

2011-08-26 02:58:19 -04:00

history-substring-search

Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh

2011-08-26 02:58:19 -04:00

kate

Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh

2011-08-26 02:58:19 -04:00

knife

Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh

2011-08-26 02:58:19 -04:00

lein

Lein completion

2011-03-02 15:20:43 +05:30

lighthouse

Fix lighthouse plugin error message

2010-11-02 11:26:49 +00:00

lol

add 'lol' plugin (based on lolbash)

2011-03-12 16:23:55 +01:00

macports

Cleaned up lib/ and removed trailing white space everywhere.

2011-06-01 02:48:26 -04:00

mysql-macports

Fixed folder naming for mysql-macports plugin and improved start/stop scripts.

2011-04-20 15:50:55 +02:00

node

Rollback of Pull #366

2011-05-30 10:07:15 -04:00

npm

Replaced npm 0.x completion with 1.0 completion.

2011-05-01 11:46:11 -04:00

osx

Added metadata file removal to osx plugin.

2011-07-28 18:20:36 -04:00

perl

Cleaned up lib/ and removed trailing white space everywhere.

2011-06-01 02:48:26 -04:00

phing

Removed the echo statement - no need for that.

2010-11-17 11:17:03 +01:00

pip

Optimize plugin loading so that only one call to compinit is required

2011-04-12 17:41:09 -04:00

pow

Pow! Restart Helper

2011-05-28 11:09:37 -04:00

powder

Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh

2011-08-26 02:58:19 -04:00

rails

Removing capistrano aliases/functions from rails plugin (since cap is not rails-specific).

2010-10-01 14:15:52 -05:00

rails3

Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh

2011-08-26 02:58:19 -04:00

redis-cli

Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh

2011-08-26 02:58:19 -04:00

ruby

Gem List Helper

2011-05-28 10:50:06 -04:00

rvm

Merged lib/git.zsh and lib/rvm.zsh into plugins/.

2011-06-01 14:14:20 -04:00

ssh-agent

Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh

2011-08-26 02:58:19 -04:00

svn

Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh

2011-08-26 02:58:19 -04:00

taskwarrior

Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh

2011-08-26 02:58:19 -04:00

textmate

Cleanup

2011-05-28 13:06:03 -04:00

thor

Thor

2011-05-28 13:12:03 -04:00

vagrant

Cleaned up lib/ and removed trailing white space everywhere.

2011-06-01 02:48:26 -04:00

yum

new yum plugin with useful aliases

2011-04-07 10:23:06 +02:00