AMR/git_merge.sh

29 lines
930 B
Bash
Raw Normal View History

2019-05-20 14:16:53 +02:00
#######################################################################
# To push new commits to the premaster branch, run: #
# bash git_premaster.sh "commit message" #
# #
# After successful CRAN checks, merge it to the master branch with: #
# bash git_merge.sh #
#######################################################################
# stash current changes
# git stash --quiet
# go to master
git checkout master --quiet
echo "changed branch to master"
# import everything from premaster
2019-06-01 20:40:49 +02:00
git merge premaster --quiet
2019-05-20 14:16:53 +02:00
# and send it to git
2019-06-01 20:40:49 +02:00
git push --quiet
echo "pushed changes to master"
2019-05-20 14:16:53 +02:00
# return to premaster
git checkout premaster --quiet
echo "changed branch back to premaster"
2019-06-01 20:40:49 +02:00
git status --short
2019-05-20 14:16:53 +02:00
# and get stashed changes back
# git stash apply --quiet