Commit Graph

1036 Commits

Author SHA1 Message Date
Robby Russell
7d9ae4cdb1 Merge pull request #1055 from daniellockard/patch-1
Added an if-statement to see if git is installed
2012-06-13 13:17:24 -07:00
Robby Russell
d297524bf5 Merge pull request #1065 from ntpeters/patch-1
Added more aliases for yum
2012-06-13 13:15:15 -07:00
Robby Russell
00c8e332a2 Merge branch 'master' of github.com:robbyrussell/oh-my-zsh 2012-06-13 13:14:28 -07:00
Robby Russell
4199c1a6f7 Updating README to ask people to stop sending themes for now 2012-06-13 13:14:23 -07:00
Robby Russell
33b7f22628 Merge pull request #1148 from erichmenge/git-flow-plugin
Add a couple of options for git-flow.
2012-06-13 13:11:36 -07:00
Robby Russell
e6c81a5893 Merge pull request #1019 from matschaffer/patch-1
Don't clobber standard Esc+. behavior
2012-06-13 13:09:45 -07:00
Robby Russell
feb11a71ae Merge pull request #239 from fred-o/master
Maven and GNU Screen plugins
2012-06-13 12:34:02 -07:00
Robby Russell
21de917d3b Merge pull request #1146 from westonplatter/master
[rails3 plugin], add, rgm = rails generate migration
2012-06-13 12:30:40 -07:00
Robby Russell
2946630aa3 Merge pull request #1152 from mispy/virtualenvwrapper
Plugin for Python's virtualenvwrapper
2012-06-13 12:30:06 -07:00
Robby Russell
577d8a9a7c Merge pull request #1155 from s3dev/s3dev
Change hardcoded ~/.oh-my-zsh to $ZSH.
2012-06-13 12:27:30 -07:00
Robby Russell
c669868486 Merge pull request #1145 from tjl2/master
Removing 'ey' from bundled_commands
2012-06-13 12:26:50 -07:00
Robby Russell
57279ecd55 Merge pull request #1156 from thackoun/master
very small beug in the terminalparty theme
2012-06-13 12:23:40 -07:00
thackoun
37bce2b51a fix a very minor bug with colors of parenthesis in the terminalparty theme 2012-06-12 15:48:00 +03:00
s3
1bb715965c Change hardcoded ~/.oh-my-zsh to $ZSH. 2012-06-12 10:18:02 +02:00
Jaiden Mispy
61ceec5285 Plugin which loads Python virtualenvwrapper and activates virtualenvs on cd into git repos 2012-06-09 11:04:58 +10:00
westonplatter
477e81e343 Merge branch 'master' of github.com:westonplatter/oh-my-zsh 2012-06-08 12:20:31 -04:00
westonplatter
083cff4a57 checking if airport allows git protocol 2012-06-08 12:18:26 -04:00
Erich Menge
df30eae412 Add a couple of options for git-flow. 2012-06-03 12:44:14 -05:00
Weston Platter
a04484e546 rails3, added rgm = 'rails generate migration' 2012-06-01 19:11:53 -04:00
Tim Littlemore
c4608ba281 Removing ey command from bundled_commands. It is not usually bundled. 2012-06-01 15:26:22 +01:00
Robby Russell
caa15548c1 Merge pull request #1138 from amarraja/master
Remove heroku from the bundler plugin
2012-05-31 10:02:50 -07:00
Robby Russell
48c9e77f53 Merge pull request #1140 from mappleconfusers/pull_req_debian
Enhancements for the Debian Plugin
2012-05-31 09:55:39 -07:00
Robby Russell
91b4758d8f Now with 50% less auto-updates. 2012-05-31 09:52:53 -07:00
mapc
0673425331 Add command to directly install the output of acs 2012-05-29 14:35:25 +02:00
mapc
1876f1d558 Make the $apt_pref variable evaluatet at alias expansion by using single-quotes instad of double quotes 2012-05-29 14:35:15 +02:00
Amar Raja
8de877d632 Prevent the heroku command from being automatically bundle-exec'ed
The heroku command should not be executed via bundler, see:
https://github.com/heroku/heroku/issues/173
2012-05-29 10:20:49 +02:00
Robby Russell
3fdaf26006 Merge pull request #1026 from dir01/patch-1
Python plugin: added pygrep command, simplified pyclean
2012-05-20 19:48:31 -07:00
Robby Russell
383ee71831 Merge pull request #1079 from dylnhdsn/feature/sublime_text_plugin
added aliases for sublime text
2012-05-20 19:47:16 -07:00
Robby Russell
a36a90b932 Merge pull request #1105 from Drarok/fix-svn
Fix the svn plugin only outputting the 1st path segment
2012-05-20 19:46:11 -07:00
Robby Russell
e6fc2c6748 Merge pull request #1111 from jimeh/fix-ZSH_CUSTOM-variable
Fix $ZSH_CUSTOM variable
2012-05-20 19:45:12 -07:00
Jim Myhrberg
f9018c5efb Load themes from $ZSH_CUSTOM instead of $ZSH/custom
This seems like a simple oversight, everything else uses `$ZSH_CUSTOM`
rather than `$ZSH/custom`.
2012-05-06 11:10:16 +01:00
Jim Myhrberg
51c55ad17e Suppress "zsh: no matches found" error when $ZSH_CUSTOM has no files
The addition of `(.N)` enables the `NULL_GLOB` option which suppresses
the error output in question.

Reference: http://www.zsh.org/mla/users/2004/msg00621.html
2012-05-06 11:08:34 +01:00
Mat Gadd
e2f7623534 Don't drop everything after a trailing slash, as this breaks standard svn branches:
^/branches/featurename
^/releases/Release-vx.y
^/trunk
2012-05-03 13:03:23 +01:00
Dylan Hudson
99a3c3c5c8 changed the alias to use to cli provided by sublime text 2012-04-22 08:36:37 -07:00
Dylan Hudson
5eb466a788 added aliases for sublime text 2012-04-19 00:14:55 -07:00
ntpeters
e429a880e6 Added yum aliases for: makecache, grouplist, groupinstall, and groupremove. 2012-04-12 06:04:24 -03:00
Daniel Lockard
12e181c6f6 Added an if-statement to see if git is installed 2012-04-04 13:04:00 -05:00
fred-o
a4748a2aad Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh 2012-03-26 09:59:50 +02:00
dir01
60c3fa9371 Python plugin: added pygrep command, simplified pyclean 2012-03-22 04:34:19 +07:00
Mat Schaffer
5f72c63136 Don't clobber standard Esc+. behavior
Esc+. works as "last arg" on both bash and zsh. Seems like a shame to introduce a new standard.
2012-03-17 22:03:01 -03:00
Carlos Rodriguez
1120f97305 Merge pull request #958 from cruser42/master
URGENT: Fix for bug introduced in pull request 925
2012-02-21 09:45:49 -08:00
cruser42
5a5c93b334 Fixed bug introduced when fixing issue 896 2012-02-21 10:47:05 -05:00
Carlos Rodriguez
631e3d8e03 Merge pull request #868 from wgriffioen/bundler_add_rails
added rails to bundled_commands
2012-02-20 22:48:31 -08:00
Carlos Rodriguez
16bdd0c169 Merge pull request #925 from cruser42/bugfix/gitversionfix
Bugfix/gitversionfix
2012-02-20 22:40:12 -08:00
fred-o
7e5dda7f43 Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh 2012-02-20 09:41:45 +01:00
Aleksey Orekhov
a9f6aed307 fixed introduced to parse_git_dirty 2012-02-08 15:30:58 -05:00
Aleksey Orekhov
7ea758834b changed variable PRE_1_7_2_GIT to POST_1_7_2_GIT to make it more accurate 2012-02-08 15:25:12 -05:00
Aleksey Orekhov
dc4d7a92c1 fixed asterisk display for modified repos in git prior to 1.7.2 2012-02-08 15:19:12 -05:00
Carlos Rodriguez
362927003b Merge pull request #666 from szetobo/rails_runner
add rails runner alias
2012-01-26 23:36:37 -08:00
Carlos Rodriguez
8769e5f8c9 Removed trailing spaces in Git files. Fixes #867 2012-01-26 23:19:50 -08:00