From bccfe1389c97379388a148b3a48a63d7272ec017 Mon Sep 17 00:00:00 2001
From: Mauricio Wolff <mauricio.wolff+gh@gmail.com>
Date: Fri, 28 Feb 2020 03:06:20 +1100
Subject: [PATCH] updater: add --autostash to git pull (#7172)

If I have custom configs (like theme customizations) I have to stash my changes and get them back after the update.

By adding the --autostash on upgrade.sh, if I have any changes not commited they'll be reapplied after the upgrade, allowing me to have temporary customizations without any harm to the upgrade process.
---
 tools/upgrade.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index 3005e6542..0dc84e214 100644
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -38,7 +38,7 @@ if [ -n "$remote" ]; then
 fi
 
 printf "${BLUE}%s${NORMAL}\n" "Updating Oh My Zsh"
-if git pull --rebase --stat origin master
+if git pull --rebase --autostash --stat origin master
 then
   printf '%s' "$GREEN"
   printf '%s\n' '         __                                     __   '