From c9b49c05a6601337895698a851c207b99bc8d3c3 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Thu, 7 Jul 2011 08:53:40 +0200 Subject: Makefile: minor fix to the git command in make testrelease --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 742b8215a..4d7b7fafd 100644 --- a/Makefile +++ b/Makefile @@ -286,7 +286,7 @@ pdf: doc/org.pdf doc/orgguide.pdf card: doc/orgcard.pdf doc/orgcard_letter.pdf doc/orgcard.txt testrelease: - git checkout -b testrelease maint + git checkout -b testrelease origin/maint git merge -s recursive -X theirs master UTILITIES/set-version.pl testing git commit -a -m "Release testing" -- cgit v1.2.3-70-g09d2