Commit Graph

733 Commits

Author SHA1 Message Date
Dan Shearmur
c1c7b0e4af added git merge as gm 2011-09-26 14:44:42 +01:00
Robby Russell
762b55bb2b Merge pull request #490 from hwti/428f18cf428fd86bd6e99c4363e5f25d0e392506
Add key bindings for gnome-terminal on Fedora
2011-08-30 21:09:36 -07:00
Robby Russell
0b01195a09 Merge pull request #408 from thunfischbrot/patch-1
Included some essential aliases in the lol plugin
2011-08-30 21:06:05 -07:00
Robby Russell
91d02ffbc1 Merge pull request #575 from mr-szymanski/master
Add git alias
2011-08-30 21:04:04 -07:00
Robby Russell
9d67d75b0a Revert "Enable red dots during completion by default".
After a few weeks of using this, I'd prefer this to not be enabled by default. My bad for suggesting that in the first place.

This reverts commit fc49b4a4de.
2011-08-30 20:56:13 -07:00
Mark Szymanski
bd6aba9c68 Add an alias for ga --> git add, too 2011-08-27 16:23:49 -05:00
Mark Szymanski
1fb141cfb5 Add gss alias for git status -s 2011-08-27 16:16:51 -05: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
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
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
Loïc Yhuel
428f18cf42 Add key bindings for gnome-terminal on Fedora 2011-07-23 23:09:03 +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
Robby Russell
9e783c0a8e fixing issue with last commit merge. missed a conflict 2011-07-23 09:14:44 -07:00
Robby Russell
5e4d89385f Merge branch 'master' of github.com:robbyrussell/oh-my-zsh 2011-07-23 09:13:57 -07:00
Sven Lito
96b0af6824 adding git svn aliases 2011-07-23 09:13:49 -07:00
Sven Lito
6bb0c1c926 added git log with graph 2011-07-23 09:12:44 -07:00
Sven Lito
eb63ddf6bb added mac keybinding for backward-delete-char 2011-07-23 09:11:08 -07:00
Robby Russell
bea196de3b Merge pull request #412 from transat/master
Added git-friendly 'wedisagree' theme.
2011-07-23 09:03:15 -07:00
Robby Russell
7a452fd950 Merge pull request #461 from dpoggi/master
Added 'dpoggi' theme
2011-07-23 08:59:30 -07:00
Robby Russell
ae9457d84d Merge pull request #487 from dreur/upstream-spectrum-utility
Add utility method to spectrum
2011-07-23 08:58:10 -07:00
hobbestigrou
34f00f385c More generic. 2011-07-23 08:54:47 -07:00
Robby Russell
8a102b941f Merge branch 'master' of github.com:robbyrussell/oh-my-zsh 2011-07-23 08:41:44 -07:00
Dieter Plaetinck
3a56297ce8 Don't export oh-my-zsh configuration paramaters to the environment
These variables are only used by oh-my-zsh, so there's no need
to populate the environment of all children with them.
2011-07-23 08:41:33 -07:00
Robby Russell
2a64d08889 Merge pull request #107 from philips/philips-theme
Philips theme, sorry :-/
2011-07-23 08:29:05 -07:00