From c3740a936b0039ffeaf7cddad80957c3a8d782bf Mon Sep 17 00:00:00 2001 From: Carsten Dominik Date: Wed, 21 Jul 2010 05:53:45 +0200 Subject: [PATCH] Make release process get the tag from maint into master --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 98b73575b..01e200dd2 100644 --- a/Makefile +++ b/Makefile @@ -297,6 +297,7 @@ release: make pushreleasetag TAG=$(TAG) git push origin maint git checkout master + git merge -s ours maint UTILITIES/set-version.pl -o $(TAG) git commit -a -m "Update website to show $(TAG) as current release" git push