summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNico Weber <nicolasweber@gmx.de>2016-11-07 23:47:44 (GMT)
committerNico Weber <nicolasweber@gmx.de>2016-11-07 23:47:44 (GMT)
commit474e87d4f3addced6c3d5f78d330d12221bc2d6b (patch)
tree10a6c2bbec2827ab2f9317903c3e8cb8ae094931
parent04f4bc5dbbc9bfb96ef75f577e919082c8690ae9 (diff)
downloadNinja-474e87d4f3addced6c3d5f78d330d12221bc2d6b.zip
Ninja-474e87d4f3addced6c3d5f78d330d12221bc2d6b.tar.gz
Ninja-474e87d4f3addced6c3d5f78d330d12221bc2d6b.tar.bz2
Update RELEASING -- manual.asciidoc no longer has a version number
-rw-r--r--RELEASING12
1 files changed, 6 insertions, 6 deletions
diff --git a/RELEASING b/RELEASING
index 880a55d..cfa03b6 100644
--- a/RELEASING
+++ b/RELEASING
@@ -2,13 +2,13 @@ Notes to myself on all the steps to make for a Ninja release.
Push new release branch:
1. Consider sending a heads-up to the ninja-build mailing list first
-2. update src/version.cc with new version (with ".git"), then
- git commit -a -m 'mark this 1.5.0.git'
-3. git checkout release; git merge master
-4. fix version number in src/version.cc (it will likely conflict in the above)
-5. fix version in doc/manual.asciidoc
+2. Make sure branches 'master' and 'release' are synced up locally
+3. update src/version.cc with new version (with ".git"), then
+ git commit -am 'mark this 1.5.0.git'
+4. git checkout release; git merge master
+5. fix version number in src/version.cc (it will likely conflict in the above)
6. commit, tag, push (don't forget to push --tags)
- git commit -a -m v1.5.0; git push origin release
+ git commit -am v1.5.0; git push origin release
git tag v1.5.0; git push --tags
# Push the 1.5.0.git change on master too:
git checkout master; git push origin master