This commit is contained in:
MatMoul 2015-08-20 21:03:57 +02:00
parent bf606c032b
commit 163768423b

View file

@ -42,7 +42,7 @@ sed -i '1s/^/Current Version :\n/' CHANGELOG
echo "Make last commit..." echo "Make last commit..."
git commit -m "New Release : $version" * git commit -m "New Release : $version" *
if [ ! "$branch" = ""]; then if [ ! "$branch" = "master"]; then
echo "Merge branch $branch to master..." echo "Merge branch $branch to master..."
git checkout master git checkout master
git merge $branch git merge $branch