Commit graph

877 commits

Author SHA1 Message Date
Gaetan Semet
404a7e8eca Merge remote-tracking branch 'ysmood/master' (highlighter)
Conflicts:
	tools/upgrade.sh
2013-06-18 11:29:25 +02:00
Gaetan Semet
9465462828 New aliases for repo
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-06-18 11:28:42 +02:00
Gaetan Semet
175bab45ef Merge remote-tracking branch 'bors-ltd/master' (git alias)
Conflicts:
	plugins/git/git.plugin.zsh
	plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
	tools/upgrade.sh
2013-06-18 11:26:55 +02:00
Gaetan Semet
60f4ae1bed Merge remote-tracking branch 'cadusk/master'
Conflicts:
	templates/zshrc-linux.zsh
	templates/zshrc-mac.zsh
	templates/zshrc.zsh-template
2013-06-13 17:13:13 +02:00
Gaetan Semet
0a4553a16c Merge remote-tracking branch 'upstream/master' 2013-06-13 17:07:17 +02:00
Robby Russell
c73047e296 Merge pull request #1877 from spazm/virtualenvwrapper-cleanup
virtualenvwrapper plugin cleanup
2013-06-12 19:27:59 -07:00
Gaetan Semet
c71471ce98 New cuting edges aliases
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-06-12 15:47:03 +02:00
Gaetan Semet
4ca1f0fd8b New aliases for git
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-06-12 15:46:41 +02:00
Gaetan Semet
7591b56b9d Better super-grep
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-06-12 11:54:08 +02:00
Gaetan Semet
8e8acbd428 Merge branch 'gsemet_push_common_aliases' of https://github.com/Stibbons/oh-my-zsh into gsemet_push_common_aliases
Conflicts:
	plugins/common-aliases/common-aliases.plugin.zsh
2013-06-11 15:01:53 +02:00
Gaetan Semet
b832ec9208 New plugin 'common-aliases' for optional cutting edge zsh aliases
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-06-11 14:58:25 +02:00
Gaetan Semet
745f41114b new repo aliases
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-06-11 14:49:58 +02:00
Gaetan Semet
de518e4242 Update Git aliases
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-06-11 14:49:50 +02:00
Gaetan Semet
ddf9b8be15 new git alias : gfa
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-06-11 11:34:40 +02:00
Gaetan Semet
521f9e78b6 New git alias : gitk-entier-history
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-06-10 11:40:36 +02:00
Andrew Grangaard
894e1caa0a virtualenv cleanup: replaces subshell with prompt expansion.
* :t parameter expansion returns the last portion of the path,
  equivalent to basename. I <3 zsh.
* adds comments for the VIRTUAL_ENV_DISABLE_PROMPT,
  used by virtual_env activate

See also:
  http://zsh.sourceforge.net/Doc/Release/Expansion.html#Parameter-Expansion
2013-06-08 11:36:33 -07:00
Andrew Grangaard
e73dd2cdf8 virtualenvwrapper plugin cleanup
* removes cd override by using chpwd_functions
* removes subshell call to which by using $+commands array and
  c param expansion to find in PATH
* zsh love!
2013-06-08 11:36:14 -07:00
Gaetan Semet
037154b250 Moved custom aliases in main plugin dirs and added a buildbot_dev for my own aliases
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-06-05 15:26:09 +02:00
Gaetan Semet
3eea198275 Splitted repo
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-06-05 15:11:57 +02:00
Gaetan Semet
7f6d747d3b New plugin for git-repo (https://code.google.com/p/git-repo/)
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-06-05 14:49:32 +02:00
Gaetan Semet
781364a35a Merge remote-tracking branch 'upstream/master'
Conflicts:
	lib/theme-and-appearance.zsh
	plugins/tmux/tmux.plugin.zsh
2013-06-05 11:10:38 +02:00
Gaetan Semet
db6615c401 New upcomming plugin: ufw 2013-06-05 11:03:25 +02:00
Gaetan Semet
b60696e88d gmt as an alias for git merge tool --no-prompt 2013-06-05 11:03:09 +02:00
Carlos Cardoso
ee3267f30d Merged official branch changes. 2013-06-03 22:12:29 -03:00
Carlos Cardoso
52498671f4 Updated vim to alias mvim -v 2013-06-03 21:28:03 -03:00
Marc-Antoine Lemieux
bd38c50241 fix the open command in linux using xdg-open 2013-05-27 09:23:14 -04:00
Robby Russell
78077afd12 Merge pull request #1837 from xuhdev/web-search
Add web-search plugin.
2013-05-21 15:51:07 -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
bebugz
6de78ad2ba gentoo linux support 2013-05-09 13:12:11 +04:00
Hervé Cauwelier
fb319d6616 reactivate virtualenvwrapper by default 2013-05-05 12:41:55 +02:00
Hervé Cauwelier
cd59e6c2b7 plugins/git: missing compdefs and new aliases 2013-05-05 12:41:55 +02: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
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
ys
b450b30e03 add: plugin syntax highlight. 2013-04-24 18:01:50 +08: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
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
8ce587ad9a Resolving conflict when merging in #528 2013-04-23 20:58:30 -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
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
de8bcef476 Merge pull request #1622 from hacfi/patch-1
Fix Symfony2 command completion 'permission denied'
2013-04-23 20:03:26 -07:00