townsfolk/obosdi-pkg
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update makerelease

Browse source
This commit is contained in:
MatMoul 2019-02-02 22:28:42 +01:00
parent 02bf7d889b
commit 74dd453964
1 changed files with 2 additions and 0 deletions

2
makerelease
View file

@ -47,6 +47,7 @@ git commit -a -m "New Release : $version"
if [ ! "$branch" = "master" ]; then if [ ! "$branch" = "master" ]; then
echo "Merge branch $branch to master..." echo "Merge branch $branch to master..."
git checkout master git checkout master
git pull
git merge $branch git merge $branch
read -p "Delete branch $branch ? (y/N)" choice read -p "Delete branch $branch ? (y/N)" choice
@ -98,5 +99,6 @@ rm -R .build
if [ ! "$branch" = "master" ]; then if [ ! "$branch" = "master" ]; then
git checkout $branch git checkout $branch
git merge master
git push git push
fi fi