hasufell/ghc-mod
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

docs in bump.sh

Browse Source
This commit is contained in:
Daniel Gröber 2016-07-11 06:54:52 +02:00
parent 8a7e7f9c1b
commit 4e57fcfb4e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/bump.sh
View File

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