diff options
author | Bastien Guerry <bzg@altern.org> | 2011-07-07 08:53:40 +0200 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2011-07-07 08:53:40 +0200 |
commit | c9b49c05a6601337895698a851c207b99bc8d3c3 (patch) | |
tree | 402d1bd81e4093c42376ef557e9e5e5e72140a07 | |
parent | 8567831ff8dd35dd03db14b303e81b04a2bded47 (diff) |
Makefile: minor fix to the git command in make testreleaserelease_7.6
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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" |