From 344f88dbf35bda8961743c27415779c29115bbfb Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Wed, 13 Sep 2017 19:25:54 +0200
Subject: [PATCH] [Update] Set merge.defaultToUpstream true

---
 update.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/update.sh b/update.sh
index 62b23d10..af4fa1a7 100755
--- a/update.sh
+++ b/update.sh
@@ -74,7 +74,7 @@ else
 	exit 1
 fi
 
-read -r -p "Are you sure you want to update mailcow: dockerized? All containers will be stopped. [y/N] " response
+read -r -p "Are you sure you want to update mailcow: dockerized? [y/N] " response
 if [[ ! "$response" =~ ^([yY][eE][sS]|[yY])+$ ]]; then
 	echo "OK, exiting."
 	exit 0
@@ -92,6 +92,7 @@ git commit -am "Before update on ${DATE}" > /dev/null
 echo -e "\e[32mFetching updated code from remote...\e[0m"
 git fetch origin ${BRANCH}
 echo -e "\e[32mMerging local with remote code (recursive, options: \"theirs\", \"patience\"...\e[0m"
+git config merge.defaultToUpstream true
 git merge -Xtheirs -Xpatience -m "After update on ${DATE}"
 # Need to use a variable to not pass return codes of if checks
 MERGE_RETURN=$?