diff options
| author | Nico Weber <nicolasweber@gmx.de> | 2016-11-08 03:01:17 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-08 03:01:17 (GMT) |
| commit | a232a7f85e0d00df10fd578330b5184523d18533 (patch) | |
| tree | 5d770e8316cb58859a897be56e8083e95fd90602 | |
| parent | fdfff1127aa01c686801b0178293d4de52879aa8 (diff) | |
| parent | 14f47940af19a9d153074ff177c5f0ab8cc3e4b9 (diff) | |
| download | Ninja-a232a7f85e0d00df10fd578330b5184523d18533.zip Ninja-a232a7f85e0d00df10fd578330b5184523d18533.tar.gz Ninja-a232a7f85e0d00df10fd578330b5184523d18533.tar.bz2 | |
Merge pull request #1204 from nico/vernum
fix RELEASING wrt manual.asciidoc process
| -rw-r--r-- | RELEASING | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -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: |