forked from mirrors/org-mode
Merge branch 'master' into maint
This commit is contained in:
commit
46a72d2173
6
Makefile
6
Makefile
|
@ -327,11 +327,12 @@ relup:
|
||||||
testrelease:
|
testrelease:
|
||||||
git checkout -b testrelease maint
|
git checkout -b testrelease maint
|
||||||
git merge -s recursive -X theirs master
|
git merge -s recursive -X theirs master
|
||||||
UTILITIES/set-version.pl $(TAG)
|
UTILITIES/set-version.pl testing
|
||||||
git commit -a -m "Release $(TAG)"
|
git commit -a -m "Release testing"
|
||||||
make distfile TAG=testversion
|
make distfile TAG=testversion
|
||||||
make cleanrel
|
make cleanrel
|
||||||
rm -rf org-testversion*
|
rm -rf org-testversion*
|
||||||
|
git reset --hard
|
||||||
git checkout master
|
git checkout master
|
||||||
git branch -D testrelease
|
git branch -D testrelease
|
||||||
|
|
||||||
|
@ -350,6 +351,7 @@ release:
|
||||||
git checkout master
|
git checkout master
|
||||||
UTILITIES/set-version.pl -o $(TAG)
|
UTILITIES/set-version.pl -o $(TAG)
|
||||||
git commit -a -m "Update website to show $(TAG) as current release"
|
git commit -a -m "Update website to show $(TAG) as current release"
|
||||||
|
git push
|
||||||
make updateweb
|
make updateweb
|
||||||
|
|
||||||
cleancontrib:
|
cleancontrib:
|
||||||
|
|
Loading…
Reference in New Issue