Commit graph

1,920 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
17a7a47fc0 Rebase on update
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-06-18 11:28:32 +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
Robby Russell
b8af807b43 Merge pull request #1878 from spazm/virtualenv-cleanup
virtualenv cleanup: replaces subshell with prompt expansion.
2013-06-12 19:27:07 -07:00
Gaetan Semet
a21aea7ea4 Add cdp alias
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-06-12 16:41:53 +02: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
b2d8d022f2 Merge remote-tracking branch 'upstream/master' 2013-06-11 14:52:46 +02:00
Gaetan Semet
5817a61e59 source ~/.profile for upgrading (to source the proxy configuration)
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-06-11 14:50:32 +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
Gaetan Semet
473e5a636a Updated dotfile with git configuration
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-06-10 11:37:57 +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
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
Stibbons
2703f6c241 Changed default plugins for mac and linux templates 2013-06-05 23:56:06 +02: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
Gaetan Semet
1959f579e1 Add rebase flag in prompt
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-06-05 11:02:49 +02:00
Gaetan Semet
3ae99a386a Updated launch_script completion (not all feature supported)
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-06-05 11:02:27 +02:00
Gaetan Semet
046b1f6d34 Added new alias
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-06-05 11:01:42 +02:00
Carlos Cardoso
b501522a21 Changing theme. 2013-06-03 23:09:42 -03: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
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
Hervé Cauwelier
fb319d6616 reactivate virtualenvwrapper by default 2013-05-05 12:41:55 +02:00