Commit Graph

4 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
Sorin Ionescu
94ab5e0ec8 Cleaned up lib/ and removed trailing white space everywhere.
Conflicts:

	oh-my-zsh.sh
2011-06-01 02:48:26 -04:00
Matt Doran
5af19be02f Fix typos in the svn plugin that would cause calls to 'svn' when not in an svn working copy. 2011-06-04 00:32:05 +10:00
Robin Ramael
a42aea147d Added svn info in prompt with plugin.
If the svn plugin is used, svn info (repo name and wether the repo is dirty) is displayed in the prompt like with git. Just lke with git, the colors can be manipulated with variables (see awesomepanda theme for example).
2011-01-10 18:18:31 +01:00