Commit graph

1776 commits

Author SHA1 Message Date
Michiel Missotten
d6945e2daa Adding a rebase option to git alias. 2013-06-11 11:23:02 +02:00
Robby Russell
5d6a06bda6 Merge pull request #1870 from mfrobben/patch-1
Update README.textile
2013-06-06 22:45:23 -07:00
Matthew Robben
b1f41f6fa5 Update README.textile
Add upgrade command to docs. I canceled the prompt once and went hunting for this so I could upgrade.
2013-06-06 02:18:25 -03:00
Robby Russell
86a889ea08 Merge pull request #1849 from lemieux/master
Fix for Jira plugin on Linux
2013-05-30 10:19:21 -07:00
Marc-Antoine Lemieux
bd38c50241 fix the open command in linux using xdg-open 2013-05-27 09:23:14 -04:00
Robby Russell
79196f8213 Merge pull request #1834 from croach/disable_untracked_files_dirty_fix
Adding a fix for the DISABLE_UNTRACKED_FILES_DIRTY option.
2013-05-23 07:58:50 -07:00
Robby Russell
0078538478 Merge pull request #1775 from marcusmueller/fixupgradetool
fix for failing substition & eliminated unnecessary cd
2013-05-23 07:52:52 -07:00
Robby Russell
78077afd12 Merge pull request #1837 from xuhdev/web-search
Add web-search plugin.
2013-05-21 15:51:07 -07:00
Robby Russell
688225a07e Merge pull request #1839 from Kronuz/patch-1
Fixed recursion. Git not needed for it to work.
2013-05-21 15:50:43 -07:00
Germán M. Bravo
69116fa806 Fixed recursion. Git not needed for it to work.
Avoid infinite `cd` loops under certain conditions. Try getting `.venv` from the current directory (not necessarily always using git)
2013-05-21 14:20:28 -04:00
Hong Xu
2531381477 Add web-search plugin.
This plugin adds google, bing and yahoo commands to launch the default
web browser to do web search:

e.g.

    google oh-my-zsh
    bing what is zsh
2013-05-20 22:18:07 -07:00
Christopher Roach
4ff861ee11 Adding a fix for the DISABLE_UNTRACKED_FILES_DIRTY option. 2013-05-19 12:55:10 -07:00
Robby Russell
27c6becffd Merge pull request #1803 from bebugz/patch-1
gentoo linux support
2013-05-09 20:38:45 -07:00
bebugz
6de78ad2ba gentoo linux support 2013-05-09 13:12:11 +04:00
Robby Russell
b34aee7f76 Merge pull request #1774 from kevinxucs/sublime-default-2
Change sublime text path select priority on mac.
2013-04-30 23:03:24 -07:00
Robby Russell
b427a41fd3 Merge pull request #1779 from lorn/fasd_update
Cache for fasd --init
2013-04-30 23:02:56 -07:00
Lindolfo 'Lorn' Rodrigues
f28e16a158 Cache for fasd --init
Using cache technique for faster fasd --init as shown at:
 https://github.com/clvv/fasdi#install
2013-04-30 02:04:09 -03:00
Marcus Müller
39b46f526c eliminated unnecessary cd and failing substitution
Changing the working directory in a sub-subshell
does not change the working directory of the executing
shell.

The substitution was broken for me on _all_ my machines,
so I started looking into the business.
2013-04-29 09:51:21 +02:00
Kaiwen Xu
17a092b0ff Change sublime text path select priority on mac.
User changed symbolic link for sublime binary is now top priority,
since this allows users to actually specify which version of sublime
they want to use. Sublime text 2 binary has higher priority over
sublime text (3) binary, since sublime text 2 is considered more
stable.
2013-04-29 03:19:31 -04:00
Robby Russell
b6ea876971 Merge pull request #690 from essembeh/master
Adding ~/.ssh/config parsing for host list and theme.
2013-04-23 21:27:51 -07:00
Robby Russell
fd50759e39 Merge pull request #1254 from systemfreund/master
Added completion plugin for "Go" compiler
2013-04-23 21:26:43 -07:00
Robby Russell
ffc6ae937c Spin to bundler 2013-04-23 21:25:03 -07:00
Robby Russell
dff6333b6d Merge branch 'master' of github.com:robbyrussell/oh-my-zsh 2013-04-23 21:20:14 -07:00
Robby Russell
f44d403572 Resolving conflict with merge of #1058 2013-04-23 21:20:00 -07:00
Robby Russell
02f86c4a5a Merge pull request #1633 from alec-c4/master
rails4 plugin
2013-04-23 21:17:52 -07:00
Robby Russell
980aaddb03 Merge pull request #917 from agate/patch-1
added "publish" and "track" command completion for git-flow plugin
2013-04-23 21:17:34 -07:00
Robby Russell
6637c29b1e Merge pull request #1091 from jmazzi/patch-1
Improve README; Instructions for handling updates
2013-04-23 21:12:52 -07:00
Robby Russell
24e59aeb7e Merge pull request #1102 from drnic/git-config
More git aliases
2013-04-23 21:12:11 -07:00
Robby Russell
7ab25fba8c Merge pull request #1225 from bobmaerten/patch-1
vagrant uses 'ssh-config' command, not 'ssh_config'
2013-04-23 21:10:10 -07:00
Robby Russell
89515e3f1f Merge pull request #711 from jasongill/textmate-plugin-improvement
Improvements to the tm command in the TextMate plugin
2013-04-23 21:07:33 -07:00
Robby Russell
5078c0814d Merge pull request #424 from hackedy/fix
use /home/ryan/d/.oh-my-zsh instead of ~/.oh-my-zsh for cache
2013-04-23 21:06:28 -07:00
Robby Russell
cd0908917c Merge branch 'master' of github.com:robbyrussell/oh-my-zsh 2013-04-23 20:58:47 -07:00
Robby Russell
8ce587ad9a Resolving conflict when merging in #528 2013-04-23 20:58:30 -07:00
Robby Russell
8890df1251 Merge pull request #922 from sbfaulkner/master
patch rbenv support for themes
2013-04-23 20:57:24 -07:00
Robby Russell
b035662e4c Merge pull request #1053 from cwoodcox/master
Added a neat theme called half-life. It's pretty and quite functional.
2013-04-23 20:56:18 -07:00
Robby Russell
c3c355a88a Merge branch 'master' of github.com:robbyrussell/oh-my-zsh 2013-04-23 20:53:38 -07:00
Robby Russell
dd6247057e Updating the README file 2013-04-23 20:52:18 -07:00
Robby Russell
27ff262e09 Merge pull request #1088 from avit/avit-theme
avit theme
2013-04-23 20:49:14 -07:00
Robby Russell
b4578be3f1 Merge pull request #818 from jmacdonald/master
Alias for 'git diff'
2013-04-23 20:48:36 -07:00
Robby Russell
e4891c5891 Merge pull request #1569 from ZeroKnight/master
Better custom theme loading
2013-04-23 20:47:29 -07:00
Robby Russell
81ed0c4115 Resolving conflict with merge of #970 2013-04-23 20:44:35 -07:00
Robby Russell
b0f8683ffa Merge pull request #1223 from bigjust/master
Basic Virtualenv plugin
2013-04-23 20:39:27 -07:00
Robby Russell
de1f803de9 Merge pull request #1620 from hreese/gpg-agent_with_sensible_ssh-agent
Disable ssh-agent support in gpg-agent-plugin if another ssh-agent is already available.
2013-04-23 20:37:48 -07:00
Robby Russell
84d9b020c2 Merge pull request #1490 from khrt/master
Added support for Subversion 1.7 for SVN plugin
2013-04-23 20:36:59 -07:00
Robby Russell
685c746cc7 Merge pull request #1565 from serdardalgic/autoenv-plugin
Add autoenv plugin, which adopts using Kenneth Reitz's autoenv.
2013-04-23 20:33:50 -07:00
Robby Russell
a2c8db9eb3 Resolving conflict in #1266 merge 2013-04-23 20:30:21 -07:00
Robby Russell
7cdb6d667c Resolving conflict when merging in 1570 2013-04-23 20:21:18 -07:00
Robby Russell
d6a36b1756 Merge pull request #1575 from mguindin/agnoster-change
[agnoster-theme] modifying theme for dirty/staged files
2013-04-23 20:17:40 -07:00
Robby Russell
b61555d7c0 Merge pull request #1582 from To1ne/pushdminus
use pushdminus
2013-04-23 20:16:41 -07:00
Robby Russell
8fea507b5c Merge pull request #1608 from swanandp/m_lion_terminal_same_tab_support
Mountain Lion Terminal App: Support for opening tabs and windows in the same folder.
2013-04-23 20:04:08 -07:00