Merge remote-tracking branch 'upstream/master'

lib/correction.zsh

@@ -1,14 +1,13 @@
-if [[ "$DISABLE_CORRECTION" == "true" ]]; then
-  return
-else
+alias man='nocorrect man'
+alias mv='nocorrect mv'
+alias mysql='nocorrect mysql'
+alias mkdir='nocorrect mkdir'
+alias gist='nocorrect gist'
+alias heroku='nocorrect heroku'
+alias ebuild='nocorrect ebuild'
+alias hpodder='nocorrect hpodder'
+alias sudo='nocorrect sudo'
+
+if [[ "$ENABLE_CORRECTION" == "true" ]]; then
   setopt correct_all
-  alias man='nocorrect man'
-  alias mv='nocorrect mv'
-  alias mysql='nocorrect mysql'
-  alias mkdir='nocorrect mkdir'
-  alias gist='nocorrect gist'
-  alias heroku='nocorrect heroku'
-  alias ebuild='nocorrect ebuild'
-  alias hpodder='nocorrect hpodder'
-  alias sudo='nocorrect sudo'
 fi

plugins/git-flow-avh/git-flow-avh.plugin.zsh

@@ -41,6 +41,9 @@ _git-flow ()
 				'hotfix:Manage your hotfix branches.'
 				'support:Manage your support branches.'
 				'version:Shows version information.'
+				'finish:Finish the branch you are currently on.'
+				'delete:Delete the branch you are currently on.'
+				'publish:Publish the branch you are currently on.'
 			)
 			_describe -t commands 'git flow' subcommands
 		;;
@@ -95,7 +98,7 @@ __git-flow-release ()
 				'list:List all your release branches. (Alias to `git flow release`)'
 				'publish:Publish release branch to remote.'
 				'track:Checkout remote release branch.'
-				'delet:Delete a release branch.'
+				'delete:Delete a release branch.'
 			)
 			_describe -t commands 'git flow release' subcommands
 			_arguments \

tools/check_for_upgrade.sh

@@ -20,7 +20,7 @@ if [[ -z "$epoch_target" ]]; then
   epoch_target=13
 fi
 
-[ ~/.profile ] && source ~/.profile
+[ -f ~/.profile ] && source ~/.profile
 
 if [ -f ~/.zsh-update ]
 then