From 4e57fcfb4e89b217f46f99507bc94dde66474d68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Gr=C3=B6ber?= Date: Mon, 11 Jul 2016 06:54:52 +0200 Subject: [PATCH] docs in bump.sh --- scripts/bump.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/bump.sh b/scripts/bump.sh index 6b95d5e..d91164a 100755 --- a/scripts/bump.sh +++ b/scripts/bump.sh @@ -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 \