summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2011-07-07 08:53:40 +0200
committerBastien Guerry <bzg@altern.org>2011-07-07 08:53:40 +0200
commitc9b49c05a6601337895698a851c207b99bc8d3c3 (patch)
tree402d1bd81e4093c42376ef557e9e5e5e72140a07
parent8567831ff8dd35dd03db14b303e81b04a2bded47 (diff)
downloadorg-mode-c9b49c05a6601337895698a851c207b99bc8d3c3.tar.gz
Makefile: minor fix to the git command in make testreleaserelease_7.6
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 742b821..4d7b7fa 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"