From 93d6e1f3eb73c664fef86567434cd88d7aab4832 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Cauwelier?= <herve.cauwelier@polyconseil.fr>
Date: Tue, 23 Oct 2012 11:04:01 +0200
Subject: [PATCH] pull rebase to keep changes

---
 tools/upgrade.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index 0aeebdebf..247d52698 100644
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -3,7 +3,7 @@ current_path=${current_path/ /\\ }
 printf '\033[0;34m%s\033[0m\n' "Upgrading Oh My Zsh"
 cd "$ZSH"
 
-if git pull origin master
+if git pull --rebase origin master
 then
   printf '\033[0;32m%s\033[0m\n' '         __                                     __   '
   printf '\033[0;32m%s\033[0m\n' '  ____  / /_     ____ ___  __  __   ____  _____/ /_  '