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
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
Robby Russell
de8bcef476
Merge pull request #1622 from hacfi/patch-1
...
Fix Symfony2 command completion 'permission denied'
2013-04-23 20:03:26 -07:00
Robby Russell
cb8ccaf3cc
Merge pull request #1634 from Anahkiasen/patch-1
...
Add alias for "composer dump-autoload"
2013-04-23 20:03:10 -07:00
Robby Russell
7787d1da6e
Merge pull request #1641 from NeuralSandwich/master
...
Battery plugin updates
2013-04-23 20:01:40 -07:00
Robby Russell
1235b77eff
Merge pull request #1702 from mbauhardt/copyfile
...
a plugin (function) which copies the content of a file into the clipboar...
2013-04-23 19:59:51 -07:00
Robby Russell
42127bee6d
Merge pull request #1715 from dbohdan/master
...
Fixed a UTF-8 problem in the theme "fishy"
2013-04-23 19:58:59 -07:00
Robby Russell
966108a082
Merge pull request #1724 from miry/rails_aliases
...
Added global aliases to use RAILS_ENV.
2013-04-23 19:58:30 -07:00
Robby Russell
6daaae6347
Merge pull request #1703 from marcparadise/mp/knife-chef-11-initial-support
...
initial support for chef 11 integrated knife-essentials
2013-04-23 19:56:44 -07:00
Robby Russell
73edf1f1eb
Merge pull request #1704 from laggyluke/st3
...
Support for Sublime Text 3
2013-04-23 19:56:26 -07:00
Robby Russell
1ae16a20d8
Merge pull request #1718 from toctan/master
...
command-not found support for Arch Linux
2013-04-23 19:55:46 -07:00
Robby Russell
2badd62c0e
Merge pull request #1721 from z2v/hgplugin
...
Mercurial: add alias for 'hg bookmarks'
2013-04-23 19:55:30 -07:00
Robby Russell
108fe7c933
Merge pull request #1707 from bkg/django-static
...
Add django plugin command
2013-04-23 19:53:50 -07:00
Robby Russell
b01a48d056
Merge pull request #1714 from f0y/07738ea86330b7b77127fc6f18474b3da2c6ecec
...
Colorize plugin
2013-04-23 19:53:33 -07:00
