ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into maint

This commit is contained in:
Carsten Dominik 2010-07-20 15:56:44 +02:00
parent d541ab84df 30253e5ed8
commit 46a72d2173
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -327,11 +327,12 @@ relup:
testrelease:
git checkout -b testrelease maint
git merge -s recursive -X theirs master
UTILITIES/set-version.pl $(TAG)
git commit -a -m "Release $(TAG)"
UTILITIES/set-version.pl testing
git commit -a -m "Release testing"
make distfile TAG=testversion
make cleanrel
rm -rf org-testversion*
git reset --hard
git checkout master
git branch -D testrelease
@ -350,6 +351,7 @@ release:
git checkout master
UTILITIES/set-version.pl -o $(TAG)
git commit -a -m "Update website to show $(TAG) as current release"
git push
make updateweb
cleancontrib: