summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-12-14Merge pull request #3389 from bubenkoff/add-current-bookmark-rkj-repozRobby Russell
add current bookmark to rkj-repos theme
2014-12-14Merge pull request #3359 from unixorn/dont-clobber-histsize-and-savehistRobby Russell
Don't clobber $HISTSIZE and $SAVEHIST
2014-12-14Merge pull request #3326 from DanielFGray/masterRobby Russell
ignore any grep aliases that might be defined
2014-12-14Merge pull request #3403 from mcornella/fix-grep-libraryRobby Russell
Fix grep.zsh library
2014-12-14Merge pull request #3366 from ratza/masterRobby Russell
Fix for command autocomplete for Symfony 2.6.x
2014-12-13Change to alias and remove deprecated GREP_COLOROndřej Súkup
2014-12-13Tidy up the grep.zsh libraryMarc Cornellà
2014-12-13Use unaliased grep in flag checkMarc Cornellà
2014-12-13Ignore .bzr folders in grep tooMarc Cornellà
2014-12-13Extract VCS folders definition to avoid repetitionMarc Cornellà
2014-12-12Merge pull request #3344 from wrboyce/custom-libRobby Russell
allow overriding lib/*.zsh in custom/lib
2014-12-10add current bookmark to rkj-repos themeAnatoly Bubenkov
2014-12-08allow overriding lib/*.zsh in custom/libWill Boyce
2014-12-02Fixed command autocomplete for Symfony 2.6.xIon Marusic
2014-11-30Existing code indents with spaces, not tabs, conform.Joe Block
2014-11-30Don't clobber HISTSIZE or SAVEHIST if they're already setJoe Block
2014-11-27Merge pull request #2448 from gawashburn/masterRobby Russell
Fix autojump script to support Nix installations
2014-11-27Merge pull request #2871 from wrboyce/extract-pigzRobby Russell
use pigz if available in extract plugin
2014-11-27Merge pull request #3092 from MWers/aws-brew-issueRobby Russell
[aws plugin] Changed brew cmd to properly report if awscli is installed via homebrew
2014-11-27Merge pull request #3265 from thii/fix-yosemite-brokenRobby Russell
Fix Yosemite broken zsh
2014-11-27Merge pull request #3283 from jaapz/masterRobby Russell
Added VIRTUAL_ENV_DISABLE_PROMPT to steeef.zsh-theme
2014-11-27Merge pull request #3309 from jarinudom/superjarinRobby Russell
Simplify superjarin theme and support chruby
2014-11-26use pigz if available in extract pluginWill Boyce
2014-11-21Fix Yosemite broken zsh where $PATH var does not get appended correctly.Doan Truong Thi
Sourcing oh-my-zsh immediately after export PATH.
2014-11-19Merge pull request #3333 from mcornella/fix-git-hide-dirtyRobby Russell
Switch back to oh-my-zsh.hide-dirty setting again
2014-11-19Merge pull request #3323 from alfss/fix-pjRobby Russell
[~] fix plugin pj
2014-11-19Switch back to oh-my-zsh.hide-dirty setting againMarc Cornellà
Commit 81004dfaba509ff62a13ba303ab941938d619326 reverted the change in 9b811fb625c03c30a766191cdf65a1c7c1fd96b2 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-16[~] fix plugin pjKravchuk S.V
https://github.com/robbyrussell/oh-my-zsh/commit/bce74975d055529cbd186782e2fd99e6da840460
2014-11-16ignore any grep aliases that might be definedDanielFGray
2014-11-15Fix autojump script to support Nix installationsGeoffrey Washburn
2014-11-10Merge simplified superjarin themeJarin Udom
2014-11-07Merge pull request #3299 from apoxa/fix-profilesRobby Russell
Fix for the profile plugin.
2014-11-07Fixes the profiles-pluginBenjamin Stier
An error was introduced with 7f75bb9, which uses special vars. This is the fix.
2014-11-06Merge pull request #3223 from mcornella/use-special-varsRobby Russell
Use special variables where we can
2014-11-06Change all hostname calls for $HOST or $SHORT_HOSTMarc Cornellà
2014-11-06Change all pwd calls for $PWD variableMarc Cornellà
This avoids spawning additional processes as $PWD **always** contains the current working directory.
2014-11-06Change all whoami calls for $USER variableMarc Cornellà
This avoid spawning additional processes, as the $USER variable will **always** contain the current logged-in user.
2014-11-06Merge pull request #3213 from nikhgupta/features/fix-emoji-clockRobby Russell
added support for GNU version of `date`
2014-11-06Merge pull request #3108 from mfaerevaag/masterRobby Russell
[wd] New minor version (v0.4)
2014-11-06Merge pull request #3131 from halilim/remove-j-aliasRobby Russell
Remove j alias for autojump
2014-11-06Merge pull request #3081 from pavoljuhas/masterRobby Russell
update the scd plugin for smart change of directory.
2014-11-06Merge pull request #2974 from elliottwilliams/patch-1Robby Russell
Fix osx function: "not valid in this context"
2014-11-06Merge pull request #2976 from shammellee/patch-1Robby Russell
typo
2014-11-06Merge pull request #2946 from moinakg/masterRobby Russell
Solaris portability tweaks.
2014-11-06Merge branch 'simonbuchan-master'Robby Russell
2014-11-062928 merge conflictRobby Russell
2014-11-06Merge pull request #2959 from crkochan/fix_rake_commandRobby Russell
Fix for recusion limit hit for _rake_command alias
2014-11-06Merge pull request #2648 from dfarrell07/masterRobby Russell
Fixed which output at each new shell creation
2014-11-06Merge pull request #2323 from michaelorr/slow-git-fixRobby Russell
Renaming config for parse_git_dirty() to avoid collision
2014-11-06Merge pull request #2168 from riyad/modernize-virtualenvRobby Russell
Modernize the virtualenv plugin