From 14b4f62e65b3d94c275ea8892f252deae9ce619a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Sat, 29 Feb 2020 14:53:06 +0100
Subject: [PATCH] updater: fix --autostash argument. Works for git > 1.7.1

See https://github.com/ohmyzsh/ohmyzsh/pull/7172#issuecomment-592875226
---
 tools/upgrade.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index 0dc84e214..9ecaed2ef 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 --autostash --stat origin master
+if git -c rebase.autoStash=true pull --rebase --stat origin master
 then
   printf '%s' "$GREEN"
   printf '%s\n' '         __                                     __   '