|
@@ -299,7 +299,7 @@ testrelease:
|
|
|
git checkout master
|
|
git checkout master
|
|
|
git branch -D testrelease
|
|
git branch -D testrelease
|
|
|
|
|
|
|
|
-# The following target makes a full release fro the stuff that is
|
|
|
|
|
|
|
+# The following target makes a full release for the stuff that is
|
|
|
# currently on master. Do it like this:
|
|
# currently on master. Do it like this:
|
|
|
#
|
|
#
|
|
|
# make release TAG=7.01
|
|
# make release TAG=7.01
|
|
@@ -323,7 +323,7 @@ release:
|
|
|
git push
|
|
git push
|
|
|
make updateweb
|
|
make updateweb
|
|
|
|
|
|
|
|
-# The following target makes a release, but from the studd that is on
|
|
|
|
|
|
|
+# The following target makes a release, but from the stuff that is on
|
|
|
# maint, not from the stuff that is on master. The idea is that it pushes
|
|
# maint, not from the stuff that is on master. The idea is that it pushes
|
|
|
# out a minor fix into a minor update, while development on master
|
|
# out a minor fix into a minor update, while development on master
|
|
|
# already went full steam ahead. To make a micro-relesse, cherry-pick
|
|
# already went full steam ahead. To make a micro-relesse, cherry-pick
|
Bastien Guerry