paxton
/
mailcow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use currently active branch

master
andryyy 2017-06-20 20:42:11 +02:00
parent 05fc733091
commit aa89603dc4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
update.sh
View File

@ -18,7 +18,7 @@ echo -e "\e[32mCommitting current status...\e[90m"
git add -u git add -u
git commit -am "Before update on ${DATE}" > /dev/null git commit -am "Before update on ${DATE}" > /dev/null
echo -e "\e[32mFetching updated code from remote...\e[90m" 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" echo -e "\e[32mMerging local with remote code...\e[90m"
git merge -Xtheirs -Xpatience -m "After update on ${DATE}" git merge -Xtheirs -Xpatience -m "After update on ${DATE}"