adphi/oh-my-zsh
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,861 Commits 2 Branches 0 Tags 19 MiB
07c013c671
Commit Graph

2861 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robby Russell
07c013c671 Merge pull request #3389 from bubenkoff/add-current-bookmark-rkj-repoz 
add current bookmark to rkj-repos theme
 2014-12-14 16:34:49 -08:00
Robby Russell
885e8187ad Merge pull request #3359 from unixorn/dont-clobber-histsize-and-savehist 
Don't clobber $HISTSIZE and $SAVEHIST
 2014-12-14 16:34:08 -08:00
Robby Russell
eced76e0fd Merge pull request #3326 from DanielFGray/master 
ignore any grep aliases that might be defined
 2014-12-14 16:32:11 -08:00
Robby Russell
311f3630d4 Merge pull request #3403 from mcornella/fix-grep-library 
Fix grep.zsh library
 2014-12-14 16:31:54 -08:00
Robby Russell
8efdbef778 Merge pull request #3366 from ratza/master 
Fix for command autocomplete for Symfony 2.6.x
 2014-12-14 16:28:18 -08:00
Ondřej Súkup
dd27087805 Change to alias and remove deprecated GREP_COLOR 2014-12-13 19:57:23 +01:00
Marc Cornellà
711843153d Tidy up the grep.zsh library 2014-12-13 19:52:49 +01:00
Marc Cornellà
0190eb084b Use unaliased grep in flag check 2014-12-13 19:45:04 +01:00
Marc Cornellà
cf586b54b8 Ignore .bzr folders in grep too 2014-12-13 19:45:02 +01:00
Marc Cornellà
0bd3c9996f Extract VCS folders definition to avoid repetition 2014-12-13 19:44:38 +01:00
Robby Russell
141c2e5934 Merge pull request #3344 from wrboyce/custom-lib 
allow overriding lib/*.zsh in custom/lib
 2014-12-12 17:45:09 -08:00
Anatoly Bubenkov
9bab8ccb89 add current bookmark to rkj-repos theme 2014-12-10 13:40:34 +01:00
Will Boyce
ed029f1801 allow overriding lib/*.zsh in custom/lib 2014-12-08 14:30:28 +00:00
Ion Marusic
011f25d492 Fixed command autocomplete for Symfony 2.6.x 2014-12-02 20:10:47 +02:00
Joe Block
5bf715787a Existing code indents with spaces, not tabs, conform. 2014-11-30 17:39:21 -08:00
Joe Block
1ebc98b9ed Don't clobber HISTSIZE or SAVEHIST if they're already set 2014-11-30 17:37:47 -08:00
Robby Russell
43aa3783f8 Merge pull request #2448 from gawashburn/master 
Fix autojump script to support Nix installations
 2014-11-27 20:03:06 -08:00
Robby Russell
5acfdf5c90 Merge pull request #2871 from wrboyce/extract-pigz 
use pigz if available in extract plugin
 2014-11-27 20:02:40 -08:00
Robby Russell
4610add16d Merge pull request #3092 from MWers/aws-brew-issue 
[aws plugin] Changed brew cmd to properly report if awscli is installed via homebrew
 2014-11-27 20:02:08 -08:00
Robby Russell
4c4f47a758 Merge pull request #3265 from thii/fix-yosemite-broken 
Fix Yosemite broken zsh
 2014-11-27 20:01:43 -08:00
Robby Russell
60a41a866a Merge pull request #3283 from jaapz/master 
Added VIRTUAL_ENV_DISABLE_PROMPT to steeef.zsh-theme
 2014-11-27 20:01:28 -08:00
Robby Russell
9f4dfc0a23 Merge pull request #3309 from jarinudom/superjarin 
Simplify superjarin theme and support chruby
 2014-11-27 20:00:56 -08:00
Will Boyce
db8eacf6fd use pigz if available in extract plugin 2014-11-26 14:20:00 +00:00
Doan Truong Thi
b6b1dd3cd7 Fix Yosemite broken zsh where $PATH var does not get appended correctly. 
Sourcing oh-my-zsh immediately after export PATH.
 2014-11-21 10:07:23 +09:00
Robby Russell
0222e77497 Merge pull request #3333 from mcornella/fix-git-hide-dirty 
Switch back to oh-my-zsh.hide-dirty setting again
 2014-11-19 12:41:12 -08:00
Robby Russell
6a496d2cca Merge pull request #3323 from alfss/fix-pj 
[~] fix plugin pj
 2014-11-19 12:40:59 -08:00
Marc Cornellà
a301f567e3 Switch back to oh-my-zsh.hide-dirty setting again 
Commit 81004dfaba reverted the change
in 9b811fb625 when editing the merge
conflict from #2928.

This commit fixes that so that we don't make the same mistake again.

First seen in http://git.io/Cdaj5Q
 2014-11-19 18:40:18 +01:00
Kravchuk S.V
0c04470f63 [~] fix plugin pj 
bce74975d0
 2014-11-16 22:38:27 +03:00
DanielFGray
00ec11d3c0 ignore any grep aliases that might be defined 2014-11-16 02:47:35 -06:00
Geoffrey Washburn
923d2c85b4 Fix autojump script to support Nix installations 2014-11-15 13:32:34 -05:00
Jarin Udom
d0f3fb3a4f Merge simplified superjarin theme 2014-11-10 18:42:31 -08:00
Robby Russell
df5b09e20b Merge pull request #3299 from apoxa/fix-profiles 
Fix for the profile plugin.
 2014-11-07 07:47:33 -08:00
Benjamin Stier
11253336cf Fixes the profiles-plugin 
An error was introduced with 7f75bb9, which uses special vars. This is the
fix.
 2014-11-07 10:47:27 +01:00
Robby Russell
7f75bb90e3 Merge pull request #3223 from mcornella/use-special-vars 
Use special variables where we can
 2014-11-06 10:42:38 -08:00
Marc Cornellà
95d795e8ca Change all hostname calls for $HOST or $SHORT_HOST 2014-11-06 18:33:56 +01:00
Marc Cornellà
4310a15de5 Change all pwd calls for $PWD variable 
This avoids spawning additional processes as $PWD **always** contains
the current working directory.
 2014-11-06 18:33:56 +01:00
Marc Cornellà
74177c5320 Change all whoami calls for $USER variable 
This avoid spawning additional processes, as the $USER variable will
**always** contain the current logged-in user.
 2014-11-06 18:33:56 +01:00
Robby Russell
7034b01cd1 Merge pull request #3213 from nikhgupta/features/fix-emoji-clock 
added support for GNU version of `date`
 2014-11-06 09:28:30 -08:00
Robby Russell
8a51bfd76b Merge pull request #3108 from mfaerevaag/master 
[wd] New minor version (v0.4)
 2014-11-06 09:28:08 -08:00
Robby Russell
35f1a23735 Merge pull request #3131 from halilim/remove-j-alias 
Remove j alias for autojump
 2014-11-06 09:27:56 -08:00
Robby Russell
510055a03a Merge pull request #3081 from pavoljuhas/master 
update the scd plugin for smart change of directory.
 2014-11-06 09:27:43 -08:00
Robby Russell
6118446575 Merge pull request #2974 from elliottwilliams/patch-1 
Fix osx function: "not valid in this context"
 2014-11-06 09:27:16 -08:00
Robby Russell
e423ca04c8 Merge pull request #2976 from shammellee/patch-1 
typo
 2014-11-06 09:26:56 -08:00
Robby Russell
57ff83db59 Merge pull request #2946 from moinakg/master 
Solaris portability tweaks.
 2014-11-06 09:26:48 -08:00
Robby Russell
0f7e5e41b8 Merge branch 'simonbuchan-master' 2014-11-06 09:24:18 -08:00
Robby Russell
81004dfaba 2928 merge conflict 2014-11-06 09:24:00 -08:00
Robby Russell
1b65c55fcf Merge pull request #2959 from crkochan/fix_rake_command 
Fix for recusion limit hit for _rake_command alias
 2014-11-06 09:19:49 -08:00
Robby Russell
4eff7926b3 Merge pull request #2648 from dfarrell07/master 
Fixed which output at each new shell creation
 2014-11-06 09:19:20 -08:00
Robby Russell
160abc9a8d Merge pull request #2323 from michaelorr/slow-git-fix 
Renaming config for parse_git_dirty() to avoid collision
 2014-11-06 09:15:00 -08:00
Robby Russell
2984d2dc4b Merge pull request #2168 from riyad/modernize-virtualenv 
Modernize the virtualenv plugin
 2014-11-06 09:14:17 -08:00