Commit graph

813 commits

Author SHA1 Message Date
Armin
6c0f1e1449 mergefoo 2015-01-31 00:55:53 +01:00
Armin
43e1610e82 Merge branch 'master' of git://github.com/netzverweigerer/oh-my-zsh
Conflicts:
	lib/powerlinecolours
	themes/powerline.zsh-theme
	zshrc
2015-01-31 00:54:07 +01:00
Armin
26903c3d24 add zshrc 2015-01-31 00:49:31 +01:00
Armin
5a367dfaa6 add powerline 2015-01-31 00:49:04 +01:00
Armin
e230c28e74 add powerlinecolours 2015-01-31 00:48:16 +01:00
Armin Jenewein
0166395a0c add new host to powerlinecolours 2015-01-30 11:07:05 +01:00
Armin Jenewein
7bf46e8762 new powerline setup 2015-01-30 11:03:47 +01:00
Armin Jenewein
341349ac77 add my own powerline zsh theme 2015-01-30 10:59:31 +01:00
Armin
73b097ba12 add zshrc 2015-01-29 20:45:43 +01:00
Armin
cd13fff8be add "zsh" file 2015-01-26 13:54:52 +01:00
Armin
5e31ff9135 add ezzsh theme 2015-01-26 13:54:42 +01:00
Armin
e0d001e0d2 add dircolors 2015-01-26 13:54:25 +01:00
Armin
1c615aa798 use sane keybindings lib 2015-01-26 13:53:45 +01:00
Steve Losh
bd00365382 Merge pull request from till. 2011-08-19 09:33:05 -04:00
Steve Losh
b4cf42efe4 Merge branch 'master' of github.com:sjl/oh-my-zsh 2011-08-19 09:26:46 -04:00
Steve Losh
d80c2465dc Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh 2011-08-19 09:26:20 -04:00
Steve Losh
2d2bcf68ee Merge pull request #4 from yeevgen/patch-2
minor update regexp to fit to the new git status output
2011-08-19 06:24:57 -07:00
Robby Russell
9f46eafae0 Merge pull request #545 from ches/patch-1
Add guard to bundler plugin's wrapped commands
2011-08-12 19:22:10 -07:00
Ches Martin
11fcdb844d Add guard to bundler plugin's wrapped commands 2011-08-13 04:53:23 +07:00
Robby Russell
dc7eee4db0 Merge pull request #543 from dmondark/heroku-completion
Heroku completion plugin
2011-08-12 12:57:44 -07:00
Steve Losh
9ab8458a11 Merge with upstream. 2011-08-12 12:25:19 -04:00
Steve Losh
b35ad06fa7 Switch to static directory for pmrpg. 2011-08-12 12:12:49 -04:00
Ali B
d5333e8efc Heroku completion plugin 2011-08-12 00:40:35 +10:00
Robby Russell
be2ab22694 Merge pull request #492 from hwti/red-dots-completion
Display red dots during completion process (disabled by default)
2011-08-11 05:51:03 -07:00
Robby Russell
098e515eff Merge pull request #512 from ichesnokov/master
a little fix for showing colors during upgrade
2011-08-11 05:49:19 -07:00
Robby Russell
6682e7c43f Merge pull request #515 from rahult/feature/powder-plugin
Auto Complete Plugin for powder gem
2011-08-11 05:47:12 -07:00
Rahul Trikha
68b5ef2aab Added auto complete plugin for powder gem https://github.com/Rodreegez/powder 2011-08-02 11:24:09 +09:30
Ilya Chesnokov
b160ee6512 'echo' did not show colors without -e in upgrade.sh 2011-08-01 10:58:05 +04:00
Robby Russell
a738ca9b64 Merge pull request #464 from bkonkle/patch-1
Minor corrections to deletion detection in git_prompt_status
2011-07-30 18:08:54 -07:00
Robby Russell
52a99d947e Merge pull request #507 from walle/add_autocomplete_for_gas
Add autocomplete for gas
2011-07-30 18:06:52 -07:00
Fredrik Wallgren
c3412ca57d Replace forgotten rubies with authors 2011-07-30 04:57:25 +02:00
Fredrik Wallgren
d866662c4a Add autocomplete for gas. Based on the rvm plugin. 2011-07-30 04:38:57 +02:00
Loïc Yhuel
fc49b4a4de Enable red dots during completion by default 2011-07-28 19:52:53 +02:00
Robby Russell
dee8171fa9 Merge pull request #494 from EspadaV8/master
Fixed an issue where the SVN plugin would mark a folder as being dirty when there was an svn:external set.
2011-07-27 21:11:49 -07:00
Robby Russell
4ff45581de Merge pull request #496 from semmons99/master
add alias for `bundle package` to the bundler plugin
2011-07-27 21:08:17 -07:00
Robby Russell
383ff03cca Merge pull request #502 from sunaku/history
move history-substring-search* files into plugins/
2011-07-27 21:06:54 -07:00
Suraj N. Kurapati
fd732eb3ff move history-substring-search* files into plugins/ 2011-07-27 10:28:55 -07:00
Yevgeniy Viktorov
18211c7b5a minor update regexp to fit to the new git status output 2011-07-27 13:44:06 +03:00
Shane Emmons
6bf468f92c add alias for bundle package to the bundler plugin 2011-07-25 08:02:25 -07:00
Andrew Smith
7b25a3fca9 The original SVN pluging would mark a folder as dirty if there was an
svn:external set and the output of 'svn status' returned the check for
the external. E.g.

$ svn st
X       Application

Performing status on external item at 'Application'

Shouldn't be marked as being dirty. By grepping for only the valid
output for what should be class as dirty, it won't return false
positives.
2011-07-25 09:50:54 +10:00
Andrew Smith
3cb33fc254 Replace a duplicated test to see if we're in an SVN folder with a call to the 'in_svn' function. 2011-07-25 09:46:17 +10:00
Loïc Yhuel
0848acfb25 Display red dots during completion process (disabled by default) 2011-07-24 21:48:21 +02:00
Robby Russell
3350c2298f Merge pull request #488 from dreur/upstream-archlinux-plugin
Remove sudo when using yaourt + do not rely on abs when not in path - In
2011-07-23 09:46:45 -07:00
Robby Russell
dbc674988e Merge pull request #259 from dereine/master
Add a plugin to support kate the kde text editor
2011-07-23 09:40:54 -07:00
Robby Russell
2816ea726e Merge pull request #251 from kalasjocke/master
New terminalparty theme
2011-07-23 09:39:25 -07:00
Robby Russell
fc6f07206e Merge pull request #215 from sunaku/history
history substring search plugin from fizsh
2011-07-23 09:36:30 -07:00
Robby Russell
46440e7198 Merge pull request #208 from sorin-ionescu/plugin-extract
extract plugin
2011-07-23 09:33:42 -07:00
Robby Russell
250bee9cda Merge pull request #206 from sorin-ionescu/plugin-osx
Vastly improved Mac OS X plugin
2011-07-23 09:27:31 -07:00
Robby Russell
92467e0b90 Merge pull request #167 from jarinudom/master
Add superjarin theme that shows current ruby version via RVM
2011-07-23 09:25:30 -07:00
Robby Russell
dd6cc96bb1 Merge pull request #112 from lukerandall/master
Update theme to support fine grained git status
2011-07-23 09:15:42 -07:00