Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

RVM Plugin: Latest rubies #1047

Closed
wants to merge 83 commits into from

8 participants

@jrhorn424

RVM rubies were hard-coded as local variables. This commit updates to the latest patches for each ruby.

Edit: It seems since I'm using sjl's theme, we've got a lot of garbage in this request. Commit 30e7eb2 is the one of interest.

sjl and others added some commits
@sjl sjl Add a new "prose" theme. 926d116
@sjl sjl Switch around the .gitignore a bit to account for symlinking. 0f711ca
@sjl sjl Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh c3be63c
@sjl sjl Fix the collapsed-pwd. d136031
@sjl sjl Add annoying OS X files to the ignore. aa15f1b
Steve Losh Improve the git prompt. 3d22ee2
Steve Losh Clear new tabs. 6ec9f8c
@sjl sjl themes/prose: Replace collapse_pwd with a built-in version. 26866cf
@curiousstranger curiousstranger Initial merge, adding vi key bindings and RPROMPT clock 94db532
@curiousstranger curiousstranger vi keybindings 2e9ab0b
@curiousstranger curiousstranger Changed default theme 35e544f
Steve Losh Add bare dot aliases for backing out of directories. 2b61160
Steve Losh Load zmv to help with complex renames. 863b284
Steve Losh Add a file for Python-related things. 7bde96c
@curiousstranger curiousstranger Merge git://github.com/sjl/oh-my-zsh into sjl f0d9edc
@curiousstranger curiousstranger git_prompt_info didn't account for empty gitstat case.
Problem was only noticable with non-empty $ZSH_THEME_GIT_PROMPT_CLEAN
db2302a
@sjl sjl Undo the VI keybinding change and switch my prompt to be the default. e5fa536
@Tranquility Tranquility lib/completion: Don't select the first item of completion list.
Based on a commit by: Ole Reifschneider <mail@ole-reifschneider.de>
db18f43
Steve Losh Trash all the ruby/git cruft and tweak completion a bit. 66e9fa1
@sjl sjl Add the cdv alias to cd to the virtualenvs directory. ce4dc6f
@sjl sjl Merge branch 'master' of github.com:sjl/oh-my-zsh be0191c
Steve Losh Add the pman function to view man pages as PDFs. 9d43c16
Steve Losh Add some useful Django-related aliases. f7e528b
@sjl sjl Add the cdp function. 9cc2d09
@sjl sjl Add some simple Redis aliases. ad2d5b0
@sjl sjl Add the pj function to easily prettify JSON. 1df9ea8
@sjl sjl Merge branch 'master' of github.com:sjl/oh-my-zsh 7b68b96
@sjl sjl Add some Gunicorn aliases and the oo alias. 0be470c
@sjl sjl Add some Supervisord aliases. 0168043
@sjl sjl Move over a few more aliases from my personal .zshrc. 37303d0
@sjl sjl Start a custom version of startapp. 4ea95c3
@sjl sjl Start using tree. 968aaf2
@sjl sjl Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh bf13b92
@sjl sjl lib/django: add a pmsp alias 2d82f60
@sjl sjl Merge branch 'master' of github.com:sjl/oh-my-zsh f35fb82
@sjl sjl Add an alias for quick looking. e13b2dc
@sjl sjl Update Mercurial tab completion functions. d52ac73
@sjl sjl Remove the example script to make custom symlinkable. 7ab8155
@sjl sjl Merge branch 'master' of github.com:robbyrussell/oh-my-zsh 677c845
@sjl sjl Remove some unused aliases/functions. 8b78c01
@sjl sjl django: add pmt 3f7b1eb
@sjl sjl lib/python: lazily load the extremely slow virtualenvwrapper f2dad51
@sjl sjl lib: prune some things to load faster 3e49476
@sjl sjl Add Vim undo files to the .gitignore. edda779
@sjl sjl themes/prose: remove the battery charge prompt c279e2a
@sjl sjl themes/prose: add .box-name support 8f292a0
@sjl sjl lib/misc: add cj function 036ab9a
@sjl sjl themes/prose: Remove prompt_char to make the prompt faster. cd4d2c8
@webflo webflo fix path to github repository and installation instructions f2f09f0
@till till * test if 'custom' exists before we try to read from it
 * this is to avoid an error message when we enter zsh ;)
d631d8a
@sjl sjl Remove terminal title junk. ee28db2
@nicoulaj nicoulaj Add a plugin that emulates Fish style live command coloring. 95d695f
@sjl sjl lib/django: add South aliases d113618
@sjl sjl lib/misc: add the "What the hell did I do the other day?" function 9bedf29
@sjl sjl Merge with origin. f1fb180
@sjl sjl Merge branch 'command-coloring-plugin' of https://github.com/nicoulaj… dd22de5
@sjl sjl Add kennethreitz' Fabric tab completion as a plugin. 5aa3706
@sjl sjl Better syntax highlighting. ef5e8b1
@sjl sjl Syntax highlighting colors. fee5b95
@sjl sjl lib/directories: remove the useless . alias 0503e60
@sjl sjl Add encrypt/decrypt. 57af129
@sjl sjl Merge branch 'master' of github.com:sjl/oh-my-zsh a88f0fc
@sjl sjl themes/prose: make the Mercurial binary configurable 9f202fc
@sjl sjl Merge pull request #2 from webflo/f2f09f0ae6ed10a7e6e16c9bc111e4d4bd9…
…d5258

Untitled
68c9723
@sjl sjl Add the rprompt with the retval indicator. 2833427
@sjl sjl Merge branch 'master' of github.com:sjl/oh-my-zsh 3e67320
@sjl sjl Merge with upstream. b17f997
@sjl sjl Map Ctrl+N/P too. d160264
@sjl sjl A few tweaks for my prompt. f378bff
@yevgenko yevgenko minor update regexp to fit to the new git status output 18211c7
@sjl sjl Switch to static directory for pmrpg. b35ad06
@sjl sjl Merge with upstream. 9ab8458
@sjl sjl Merge pull request #4 from yeevgen/patch-2
minor update regexp to fit to the new git status output
2d2bcf6
@sjl sjl Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh d80c246
@sjl sjl Merge branch 'master' of github.com:sjl/oh-my-zsh b4cf42e
@sjl sjl Merge pull request from till. bd00365
Jeffrey Horn Merge SJL's fork with upstream
Merge branch 'master' of https://github.com/sjl/oh-my-zsh

Conflicts:
	README.textile
	lib/git.zsh
	oh-my-zsh.sh
7bebacb
Jeffrey Horn Fix merge errors 18e8997
Jeffrey Horn Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh 7540429
Jeffrey Horn Add line to ignore AppleDouble 0f0b9b6
Jeffrey Horn Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh d48b12b
Jeffrey Horn Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh 89a82de
Jeffrey Horn Modfiy local variables to latest ruby patches 30e7eb2
@jrhorn424

I'll clean this up and resubmit later.

@jrhorn424 jrhorn424 closed this
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jan 18, 2010
  1. @sjl

    Add a new "prose" theme.

    sjl authored
  2. @sjl
  3. @sjl
Commits on Jan 20, 2010
  1. @sjl

    Fix the collapsed-pwd.

    sjl authored
  2. @sjl
  3. Improve the git prompt.

    Steve Losh authored
Commits on Jan 25, 2010
  1. Clear new tabs.

    Steve Losh authored
Commits on Feb 1, 2010
  1. @sjl
Commits on Feb 2, 2010
  1. @curiousstranger
  2. @curiousstranger

    vi keybindings

    curiousstranger authored
  3. @curiousstranger

    Changed default theme

    curiousstranger authored
  4. Load zmv to help with complex renames.

    Steve Losh authored
  5. Add a file for Python-related things.

    Steve Losh authored
  6. @curiousstranger
  7. @curiousstranger

    git_prompt_info didn't account for empty gitstat case.

    curiousstranger authored
    Problem was only noticable with non-empty $ZSH_THEME_GIT_PROMPT_CLEAN
Commits on Feb 3, 2010
  1. @sjl
Commits on Feb 16, 2010
  1. @Tranquility

    lib/completion: Don't select the first item of completion list.

    Tranquility authored Steve Losh committed
    Based on a commit by: Ole Reifschneider <mail@ole-reifschneider.de>
Commits on Feb 27, 2010
  1. @sjl
  2. @sjl
Commits on Mar 10, 2010
  1. Add the pman function to view man pages as PDFs.

    Steve Losh authored
Commits on Mar 18, 2010
  1. Add some useful Django-related aliases.

    Steve Losh authored
Commits on Apr 23, 2010
  1. @sjl

    Add the cdp function.

    sjl authored
Commits on Apr 24, 2010
  1. @sjl

    Add some simple Redis aliases.

    sjl authored
Commits on Apr 30, 2010
  1. @sjl
  2. @sjl
  3. @sjl
  4. @sjl

    Add some Supervisord aliases.

    sjl authored
  5. @sjl
Commits on May 4, 2010
  1. @sjl
Commits on May 5, 2010
  1. @sjl

    Start using tree.

    sjl authored
Commits on May 28, 2010
  1. @sjl
Commits on Jul 8, 2010
  1. @sjl

    lib/django: add a pmsp alias

    sjl authored
Commits on Jul 12, 2010
  1. @sjl
Commits on Jul 14, 2010
  1. @sjl

    Add an alias for quick looking.

    sjl authored
Commits on Jul 21, 2010
  1. @sjl
  2. @sjl
  3. @sjl
  4. @sjl
Commits on Jul 27, 2010
  1. @sjl

    django: add pmt

    sjl authored
Commits on Aug 12, 2010
  1. @sjl
  2. @sjl
Commits on Aug 18, 2010
  1. @sjl
  2. @sjl
  3. @sjl
Commits on Aug 24, 2010
  1. @sjl

    lib/misc: add cj function

    sjl authored
Commits on Sep 24, 2010
  1. @sjl
Commits on Sep 28, 2010
  1. @webflo
Commits on Oct 3, 2010
  1. @till

    * test if 'custom' exists before we try to read from it

    till authored
     * this is to avoid an error message when we enter zsh ;)
Commits on Oct 6, 2010
  1. @sjl

    Remove terminal title junk.

    sjl authored
Commits on Nov 20, 2010
  1. @nicoulaj
Commits on Nov 23, 2010
  1. @sjl

    lib/django: add South aliases

    sjl authored
  2. @sjl
Commits on Dec 22, 2010
  1. @sjl

    Merge with origin.

    sjl authored
  2. @sjl
Commits on Dec 23, 2010
  1. @sjl
Commits on Dec 27, 2010
  1. @sjl

    Better syntax highlighting.

    sjl authored
  2. @sjl

    Syntax highlighting colors.

    sjl authored
Commits on Jan 6, 2011
  1. @sjl
Commits on Mar 24, 2011
  1. @sjl

    Add encrypt/decrypt.

    sjl authored
  2. @sjl
Commits on Apr 7, 2011
  1. @sjl
Commits on May 9, 2011
  1. @sjl
Commits on Jun 3, 2011
  1. @sjl
  2. @sjl
  3. @sjl

    Merge with upstream.

    sjl authored
Commits on Jul 22, 2011
  1. @sjl

    Map Ctrl+N/P too.

    sjl authored
  2. @sjl

    A few tweaks for my prompt.

    sjl authored
Commits on Jul 27, 2011
  1. @yevgenko
Commits on Aug 12, 2011
  1. @sjl
  2. @sjl

    Merge with upstream.

    sjl authored
Commits on Aug 19, 2011
  1. @sjl

    Merge pull request #4 from yeevgen/patch-2

    sjl authored
    minor update regexp to fit to the new git status output
  2. @sjl
  3. @sjl
  4. @sjl

    Merge pull request from till.

    sjl authored
Commits on Jan 19, 2012
  1. Merge SJL's fork with upstream

    Jeffrey Horn authored
    Merge branch 'master' of https://github.com/sjl/oh-my-zsh
    
    Conflicts:
    	README.textile
    	lib/git.zsh
    	oh-my-zsh.sh
Commits on Jan 26, 2012
  1. Fix merge errors

    Jeffrey Horn authored
Commits on Feb 2, 2012
  1. Add line to ignore AppleDouble

    Jeffrey Horn authored
Commits on Feb 23, 2012
Commits on Apr 1, 2012
  1. Modfiy local variables to latest ruby patches

    Jeffrey Horn authored
Something went wrong with that request. Please try again.