Merge remote-tracking branch 'upstream/master'

Conflicts:
	plugins/git/git.plugin.zsh
	plugins/jump/jump.plugin.zsh
This commit is contained in:
Gaetan Semet 2015-08-10 16:15:53 +02:00
commit 9a63084e20
82 changed files with 2488 additions and 966 deletions

View file

@ -10,6 +10,10 @@ ZSH_THEME="stibbons"
# Uncomment the following line to use case-sensitive completion.
# CASE_SENSITIVE="true"
# Uncomment the following line to use hyphen-insensitive completion. Case
# sensitive completion must be off. _ and - will be interchangeable.
# HYPHEN_INSENSITIVE="true"
# Uncomment the following line to disable bi-weekly auto-update checks.
DISABLE_AUTO_UPDATE="true"