docs in bump.sh

This commit is contained in:
Daniel Gröber 2016-07-11 06:54:52 +02:00
parent 8a7e7f9c1b
commit 4e57fcfb4e

View File

@ -33,7 +33,7 @@ then
fi
git checkout release
#git merge master
#git merge release-VER branch into 'release'
git merge -s recursive -X theirs release-$VERSION
( tac ChangeLog; echo "\n$(date '+%Y-%m-%d') v$VERSION" ) | tac \