summaryrefslogtreecommitdiffstats
path: root/RELEASING
diff options
context:
space:
mode:
authorNico Weber <thakis@chromium.org>2016-11-08 03:00:33 (GMT)
committerNico Weber <thakis@chromium.org>2016-11-08 03:00:33 (GMT)
commit14f47940af19a9d153074ff177c5f0ab8cc3e4b9 (patch)
tree5d770e8316cb58859a897be56e8083e95fd90602 /RELEASING
parentfdfff1127aa01c686801b0178293d4de52879aa8 (diff)
downloadNinja-14f47940af19a9d153074ff177c5f0ab8cc3e4b9.zip
Ninja-14f47940af19a9d153074ff177c5f0ab8cc3e4b9.tar.gz
Ninja-14f47940af19a9d153074ff177c5f0ab8cc3e4b9.tar.bz2
fix RELEASING wrt manual.asciidoc process
Diffstat (limited to 'RELEASING')
-rw-r--r--RELEASING5
1 files changed, 3 insertions, 2 deletions
diff --git a/RELEASING b/RELEASING
index cfa03b6..5f51b73 100644
--- a/RELEASING
+++ b/RELEASING
@@ -7,12 +7,13 @@ Push new release branch:
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)
+6. fix version in doc/manual.asciidoc (exists only on release branch)
+7. commit, tag, push (don't forget to push --tags)
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
-7. construct release notes from prior notes
+8. construct release notes from prior notes
credits: git shortlog -s --no-merges REV..
Release on github: