From 750fdcfc9b66da5ab81494fdbbba835d72b1bd87 Mon Sep 17 00:00:00 2001 From: Carsten Dominik Date: Fri, 29 Oct 2010 06:02:15 +0200 Subject: [PATCH] Use -f to push maint --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 7ee8d72b0..5af30050a 100644 --- a/Makefile +++ b/Makefile @@ -311,7 +311,7 @@ release: rm org-$(TAG)*.zip rm org-$(TAG)*.tar.gz make pushreleasetag TAG=$(TAG) - git push origin maint + git push -f origin maint git checkout master git merge -s ours maint UTILITIES/set-version.pl -o $(TAG) @@ -340,7 +340,7 @@ fixrelease: rm org-$(TAG)*.zip rm org-$(TAG)*.tar.gz make pushreleasetag TAG=$(TAG) - git push origin maint + git push -f origin maint git checkout master git merge -s ours maint UTILITIES/set-version.pl -o $(TAG)