diff --git a/makerelease b/makerelease index 59c12a1..391ba04 100755 --- a/makerelease +++ b/makerelease @@ -48,6 +48,7 @@ git commit -a -m "New Release : $version" if [ ! "$branch" = "master" ]; then echo "Merge branch $branch to master..." git checkout master + git pull git merge $branch read -p "Delete branch $branch ? (y/N)" choice @@ -68,6 +69,7 @@ esac echo "Create index.html..." fle=$(cat archdi) git checkout gh-pages +git pull echo "$fle" > index.html chmod 640 index.html git commit -a -m "New Release : $version"