07838055a8
Merge remote-tracking branch 'upstream/master'
2013-03-12 16:52:57 +01:00
0ab0e67ecf
Merge pull request #1645 from mbologna/master
...
a new theme, different from the already existent themes :)
2013-03-06 06:15:25 -08:00
0b6e735885
added comment for auto-generated hostname color
2013-03-05 23:01:00 +01:00
c2d42f5a90
added michelebologna theme
2013-03-05 22:50:27 +01:00
bc00362a01
Merge remote-tracking branch 'upstream/master'
2013-02-09 22:11:07 +01:00
fce68bbba0
Merge pull request #1594 from jbhannah/rbenv-gems-fix
...
Fix rbenv gems helper
2013-02-09 11:55:30 -08:00
1a362c11a8
Merge pull request #1583 from To1ne/pj.plugin
...
added pj.plugin
2013-02-09 11:55:03 -08:00
dace87ae36
Fix rbenv gems helper
...
Fixes gem versions with words (beta, pre) in the version or with
multiple installed versions not being highlighted, and compatibility
with GNU sed (related to robbyrussell/oh-my-zsh#1579).
2013-02-08 19:11:40 -07:00
2595484a97
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
lib/aliases.zsh
2013-02-08 19:08:06 +01:00
6e6cf43037
Merge pull request #1586 from HeroicEric/master
...
add rspec alias to zeus plugin
2013-02-07 19:30:03 -08:00
a5a6f6bb6c
add alias for rspec to zeus plugin
2013-02-07 16:26:41 -05:00
631a8473e2
added pj.plugin
2013-02-05 09:45:00 +01:00
615e41b0ec
Adding MIT-LICENSE Closes #655
2013-01-15 06:45:27 -08:00
cf03ee6d88
Merge pull request #1534 from gberenfield/master
...
Tested fix for Issue #1479
2013-01-10 22:39:37 -08:00
312da3ea05
Merge pull request #941 from dcreager/configurable-blinks-theme
...
blinks theme works with light and dark Solarized
2013-01-10 22:37:25 -08:00
9ef7e8a191
Merge pull request #1077 from Mezzle/add-option-to-show-git-status
...
Add option to disable status notification
2013-01-10 22:36:16 -08:00
a634d50645
Merge pull request #1054 from ptillemans/master
...
Updated subcommands for leiningen plugin
2013-01-10 22:34:23 -08:00
64db7b56f2
Merge pull request #1164 from fuksito/master
...
More usable aliases
2013-01-10 22:33:47 -08:00
ae7bce34fd
Merge pull request #837 from stacksmashing/master
...
Fix sprunge-plugin behaviour.
2013-01-10 22:32:26 -08:00
93c90a6bf5
Fix the fix for Issue #1479
2013-01-02 19:14:57 -05:00
003dd8f4b6
fix for Issue 1479
2013-01-02 16:20:22 -05:00
587832f155
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
2013-01-02 09:42:14 +01:00
80a6032596
Merge pull request #1510 from agnoster/agnoster-classic
...
agnoster "classic"
2012-12-31 05:27:46 -08:00
07c19b66d3
Merge pull request #1517 from thisiskun/master
...
provide the unbundled commands
2012-12-31 05:26:40 -08:00
c5ecb4e136
Fixes #1489
...
Revert "Fixed Mac OS X Terminal.app related issue with extra newlines being printed out sometimes"
This reverts commit 8f89d4d5a5
.
2012-12-31 05:25:07 -08:00
a09cd713b4
add unbundled command
2012-12-24 17:27:23 +08:00
e4624c6a36
Revert "agnoster theme shows error code instead of an "x""
...
This reverts commit f09af57179
.
It is far more aesthetically pleasing, and conveys the correct amount of information. The exact numeric status code is extremely rarely of use, and increases cognitive parsing burden on the user.
(cherry picked from commit 8f664edcaf55adcc540f0fe43d4205b66e4f9fb6)
2012-12-21 11:45:57 -05:00
397c085a19
Merge pull request #1473 from bsteuber/fix-git-flow-feature-completion
...
use feature names instead of failing branch names in "git flow feature"
2012-12-09 09:04:02 -08:00
bc7157ba75
Merge pull request #1475 from westonplatter/master
...
fixes #1474 add zeus to bundle exec list
2012-12-09 09:03:32 -08:00
d8162cdded
Merge pull request #1477 from madsgraphics/git_prompt_showstashstate
...
Add Stash toogle to display if there's some stash or not in `git_prompt_status`
2012-12-09 09:03:02 -08:00
b9a989fea5
Add Stash toogle to display if there's some stash or not in git_prompt_status
2012-12-07 10:25:02 +01:00
f3fea45dd2
fixes #1474 add zeus to bundle exec listx
2012-12-06 18:30:15 -06:00
1b91c84d2b
use feature names instead of failing branch names in "git flow feature"
2012-12-06 14:09:09 +01:00
6d7a275972
Merge pull request #1084 from avit/bwana-plugin
...
Bwana plugin for reading man pages in the browser
2012-12-05 07:21:33 -08:00
046fc5a1d8
Merge pull request #1133 from mappleconfusers/605ad8725b06cc15f8523404f59060b6a71bb7a2
...
Cat alias: :3
2012-12-05 07:19:18 -08:00
083da66c0b
Merge pull request #1139 from mappleconfusers/pull_req_git
...
Add aliases for git-remote
2012-12-05 07:16:36 -08:00
ed5d2fff1f
Merge pull request #1233 from mugenken/knife-check-cwd
...
check for knife.rb in cwd
2012-12-05 07:15:34 -08:00
dc2558c52d
Merge pull request #1467 from timothyandrew/patch-1
...
Added a `migrate` alias.
2012-12-05 07:14:29 -08:00
4154eccb31
Merge pull request #1468 from larrylv/unset-config-file-variable
...
Unset `config_file` variable in oh-my-zsh.sh
2012-12-05 07:14:13 -08:00
6c5e63022d
Unset config_file
variable in oh-my-zsh.sh
...
`config_file` variable will mess up with `cd` auto-complete command.
eg. I have a local dir named `Code`, and when I type `cd co<Tab>`,
config_file will show up, and doesn't make any sense...
2012-12-05 16:13:53 +08:00
f7fc164377
Added a migrate
alias.
...
It migrates the DB and prepares the test DB.
2012-12-05 08:21:42 +05:30
178bce287e
Merge branch 'master' of github.com:robbyrussell/oh-my-zsh
2012-12-04 08:27:13 -08:00
0118b5b759
Merge pull request #1248 from grahamc/add-symfony
...
Adding a symfony plugin, for symfony 1
2012-12-04 06:56:59 -08:00
78e3f38db7
Merge pull request #1258 from caio/git-branch-status
...
Add branch status support to git_prompt_status
2012-12-04 06:56:43 -08:00
d100354d0d
Merge pull request #778 from rschmukler/plugin-osx
...
Added vsplit_tab and split_tab for iTerm.
2012-12-04 06:55:25 -08:00
462136a9d6
Merge pull request #794 from markdrago/cloud_parameter
...
add ability to set custom prefix for cloud theme
2012-12-04 06:52:32 -08:00
5aed0aed4e
Merge pull request #875 from ttddyy/prompt_git-remove
...
prompt git-rm as deleted
2012-12-04 06:45:17 -08:00
d88fad3392
Merge pull request #880 from darrenclark/fix-mac-terminal-app-echo-issue
...
Fixed Mac OS X Terminal.app related issue with extra newlines echoed
2012-12-04 06:45:01 -08:00
24188fda80
Merge pull request #1181 from paulmars/master
...
Plugin for git_remote_branch autocomplete.
2012-12-04 06:39:49 -08:00
dbeb74ece8
Merge pull request #1189 from petemounce/yum-quote
...
Fix mismatched quote in yum plugin
2012-12-04 06:38:41 -08:00