Daniel Hahler 03ece82197 Merge remote-tracking branch 'rbenv/master' ...

Using `git merge rbenv/master -s recursive -X rename-threshold=5%`.

Conflicts:
	README.md
	bin/python-local-exec
	libexec/pyenv
	libexec/pyenv-help
	test/--version.bats

2015-12-14 13:47:11 +01:00

..

pyenv

Merge remote-tracking branch 'rbenv/master'

2015-12-14 13:47:11 +01:00

pyenv---version

v20151210

2015-12-10 08:27:05 +00:00

pyenv-commands

Import recent changes relating to fish from rbenv

2013-09-30 18:02:12 +09:00

pyenv-completions

Merge remote-tracking branch 'rbenv/master' into rbenv-20151121

2015-11-21 04:21:14 +00:00

pyenv-exec

Import rbenv changes at 7e0e85bdda092d94aef0374af720682c6ea8999d

2014-12-01 00:29:26 +09:00

pyenv-global

Use consistent quoting for versions=("$@") across bins

2014-09-11 12:59:40 +02:00

pyenv-help

Merge remote-tracking branch 'rbenv/master' into rbenv-20151121

2015-11-21 04:21:14 +00:00

pyenv-hooks

Merge remote-tracking branch 'rbenv/master' into rbenv-20151121

2015-11-21 04:21:14 +00:00

pyenv-init

Merge remote-tracking branch 'rbenv/master' into rbenv-20151121

2015-11-21 04:21:14 +00:00

pyenv-local

Use consistent quoting for versions=("$@") across bins

2014-09-11 12:59:40 +02:00

pyenv-prefix

pyenv-prefix should return proper prefix of system version (fixes #391)

2015-06-27 01:07:18 +09:00

pyenv-rehash

Merge remote-tracking branch 'rbenv/master' into rbenv-20151121

2015-11-21 04:21:14 +00:00

pyenv-root

import rbenv-help from rbenv 0.4.0

2013-01-18 19:09:56 +09:00

pyenv-sh-rehash

Reliably detect parent shell in pyenv init (fixes #93)

2013-12-26 13:48:43 +09:00

pyenv-sh-shell

Import recent changes from rbenv 0.4.0

2014-01-02 22:45:02 +09:00

pyenv-shims

Import recent changes from rbenv 0.4.0

2014-01-02 22:45:02 +09:00

pyenv-version

Use exitcode from pyenv-version-name in pyenv-version, do not halt

2014-12-11 20:37:03 +01:00

pyenv-version-file

Merge remote-tracking branch 'rbenv/master' into rbenv-20151121

2015-11-21 04:21:14 +00:00

pyenv-version-file-read

pyenv-version-file-read: use sed/cut instead of type/head/awk

2015-05-16 23:02:00 +02:00

pyenv-version-file-write

pyenv-version-file-write: do not use rm, but clobber the file

2014-09-07 16:56:40 +02:00

pyenv-version-name

Merge remote-tracking branch 'rbenv/master' into rbenv-20151121

2015-11-21 04:21:14 +00:00

pyenv-version-origin

import rbenv-help from rbenv 0.4.0

2013-01-18 19:09:56 +09:00

pyenv-versions

Skip virtualenv aliases as well (yyuu/pyenv-virtualenv#126)

2015-12-02 09:52:33 +00:00

pyenv-whence

Import rbenv changes at 7e0e85bdda092d94aef0374af720682c6ea8999d

2014-12-01 00:29:26 +09:00

pyenv-which

Merge remote-tracking branch 'rbenv/master'

2015-12-14 13:47:11 +01:00