From 4d0fd7ee20ed672090e1216f54bfac462d1ea2a6 Mon Sep 17 00:00:00 2001
From: Hadrien Lanneau <hadrien.lanneau@wikiogroup.com>
Date: Tue, 1 Jul 2014 09:47:11 +0200
Subject: [PATCH] Avoid this annoying message when upgrading :
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

« Type Y to update oh-my-zsh: Y
Upgrading Oh My Zsh
Cannot pull with rebase: You have unstaged changes.
Please commit or stash them.
There was an error updating. Try again later? »
---
 tools/upgrade.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index 9a8497d96..9d806dfae 100644
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -1,5 +1,6 @@
 printf '\033[0;34m%s\033[0m\n' "Upgrading Oh My Zsh"
 cd "$ZSH"
+git stash
 if git pull --rebase --stat origin master
 then
   printf '\033[0;32m%s\033[0m\n' '         __                                     __   '
@@ -13,4 +14,4 @@ then
 else
   printf '\033[0;31m%s\033[0m\n' 'There was an error updating. Try again later?'
 fi
-
+git stash apply