From aa89603dc4d8907758888947e47d0366c9d5f0e8 Mon Sep 17 00:00:00 2001 From: andryyy Date: Tue, 20 Jun 2017 20:42:11 +0200 Subject: [PATCH] Use currently active branch --- update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update.sh b/update.sh index a5392e4c..5811c19d 100755 --- a/update.sh +++ b/update.sh @@ -18,7 +18,7 @@ echo -e "\e[32mCommitting current status...\e[90m" git add -u git commit -am "Before update on ${DATE}" > /dev/null echo -e "\e[32mFetching updated code from remote...\e[90m" -git fetch origin master +git fetch origin ${BRANCH} echo -e "\e[32mMerging local with remote code...\e[90m" git merge -Xtheirs -Xpatience -m "After update on ${DATE}"