Permalink
Commits on Jul 30, 2012
  1. Merge branch 'zshrc' into shell

    caio committed Jul 30, 2012
    * zshrc:
      Dont correct git
      Zsh loses bindkey settings when changing modes
    
    Conflicts:
    	zshrc
  2. Dont correct git

    caio committed Jul 30, 2012
  3. Merge branch 'theme_errado' into shell

    caio committed Jul 30, 2012
    * theme_errado:
      No way to trigger funcition on interpolation. Give up for now
  4. Merge branches 'directory-completion', 'git-branch-status', 'theme_er…

    caio committed Jul 30, 2012
    …rado' and 'zshrc' into shell
    
    * directory-completion:
      Add make-dir-complete plugin
    
    * git-branch-status:
      Add branch status support to git_prompt_status
    
    * theme_errado:
      Fix branch coloring
      Add theme `errado`
    
    * zshrc:
      Track basic zshrc
  5. Track basic zshrc

    caio committed Jul 30, 2012
  6. Fix branch coloring

    caio committed Jul 30, 2012
  7. Add theme `errado`

    caio committed Jul 30, 2012
    This is basically a port from by Bash prompt
Commits on Jul 29, 2012
  1. Add make-dir-complete plugin

    caio committed Jul 29, 2012
    This plugin is a dynamic directory completion generator. Given an alias
    name and a directory, it creates a complete-enabled alias for the
    chosen directory.
    
    Example:
    
        make_dir_complete src ~/src/
    
    This will create a command `src` that completes with the subdirectories
    inside ~/src/. So, if you have something like:
    
        `-- src/
            |-- oh-my-zsh/
            |   `-- ...
            |-- oh-my-vim/
            |   `-- ...
            `-- whatever/
                `-- ...
    
    Typing
    
        src oh<TAB>
    
    Will give you a complete menu with "oh-my-zsh" and "oh-my-vim" as
    options.
    
    Ref: http://caioromao.com/blog/custom-directory-completion-for-zsh/
  2. Add branch status support to git_prompt_status

    caio committed Jul 29, 2012
    This patch makes git_prompt_status support three new status variables:
    
     - ZSH_THEME_GIT_PROMPT_AHEAD
     - ZSH_THEME_GIT_PROMPT_BEHIND
     - ZSH_THEME_GIT_PROMPT_DIVERGED
    
    With these extra variables it's easy to see (1) if you have commits in
    your local branch that weren't pushed to the remote (AHEAD), (2) if
    there are commits in the remote that you haven't merged/rebased yet
    (BEHIND) or (3) if you have local unpushed commits AND the remote has
    some commits you haven't merged yet (DIVERGED).
    
    Refer to the first line displayed on `git status -b --porcelain`.
    
    An example setup in a .zsh-theme file would be:
    
    ZSH_THEME_GIT_PROMPT_AHEAD="↑"
    ZSH_THEME_GIT_PROMPT_BEHIND="↓"
    ZSH_THEME_GIT_PROMPT_DIVERGED="↕"
Commits on Jul 20, 2012
  1. Merge pull request #1229 from seban/run_rails_without_bundle_exec

    robbyrussell committed Jul 20, 2012
    'rails' command should not be run with bundle exec
  2. auto-upadate feature will now reset the epoch so that if a user doesn…

    robbyrussell committed Jul 20, 2012
    …'t say yes, it won't ask them again for a while. fixes #1240
Commits on Jul 15, 2012
Commits on Jul 11, 2012
  1. Merge pull request #1200 from andyfleming/master

    robbyrussell committed Jul 11, 2012
    New theme af-magic.zsh-theme
Commits on Jul 10, 2012
  1. Merge pull request #1206 from Eustachy/upstream

    robbyrussell committed Jul 10, 2012
    Remove bogus "-" from nomz="ps -aux" alias.
  2. Merge pull request #1216 from joshvermaire/patch-1

    robbyrussell committed Jul 10, 2012
    Escape whitespace for Sublime Text plugin
Commits on Jul 9, 2012
  1. escape whitespace

    joshvermaire committed Jul 9, 2012
Commits on Jul 3, 2012
  1. Merge pull request #1122 from varunkvv/master

    robbyrussell committed Jul 3, 2012
    sublime pluginn : Added alias for Sublime Text 2 on Linux
  2. Merge pull request #1127 from a-b/master

    robbyrussell committed Jul 3, 2012
    Added fasd plugin
  3. Merge pull request #1193 from bameda/master

    robbyrussell committed Jul 3, 2012
    [Plugin] Virtualenvwrapper: Added another path
  4. Merge pull request #1209 from lwe/rbfu-plugin

    robbyrussell committed Jul 3, 2012
    provide plugin for rbfu (yet ruby version switcher)
  5. Merge pull request #1170 from dipth/master

    robbyrussell committed Jul 3, 2012
    Explicitly tell rbenv to use zsh
  6. provide plugin for rbfu the ruby version switcher

    lwe committed Jul 3, 2012
    Evaluates $(rbfu --init --auto) if rbfu is installed on the system,
    also has a custom rbfu-rubies method which lists the installed
    rubies which are available to rbfu.
    
    For compatibility with themes, also creates the rvm_prompt_info
    function, so existing themes should work out of the box.
Commits on Jul 1, 2012
Commits on Jun 28, 2012
  1. Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh

    Alexander Berezovsky committed Jun 28, 2012
Commits on Jun 25, 2012
  1. Added another path

    bameda committed Jun 25, 2012
Commits on Jun 24, 2012
  1. Merge pull request #1190 from vpacher/master

    robbyrussell committed Jun 24, 2012
    added jruby plugin
  2. Merge pull request #1192 from rcakirerk/a39c9ffe5b7236b6e4dc78efa80b4…

    robbyrussell committed Jun 24, 2012
    …78cc411af7f
    
    Fix finding git issue.
Commits on Jun 23, 2012
Commits on Jun 22, 2012
  1. added jexec

    vpacher committed Jun 22, 2012
  2. added plugin for jruby

    vpacher committed Jun 22, 2012
  3. Merge pull request #1174 from insside/rbenv-homebrew-fix

    robbyrussell committed Jun 22, 2012
    rbenv plugin now uses 'brew --prefix rbenv' command to find rbenv folder