Skip to content
Snippets Groups Projects
Commit 7bd44188 authored by Vermaat's avatar Vermaat
Browse files

Fix error in git tag instructions

parent e30b473b
No related branches found
No related tags found
No related merge requests found
...@@ -29,7 +29,7 @@ the latest release is available from the `release` branch. ...@@ -29,7 +29,7 @@ the latest release is available from the `release` branch.
Release procedure Release procedure
----------------- -----------------
Releasing a new version is done as follows. This assumes remote `origin` is Releasing a new version is done as follows. This assumes remote `github` is
the upstream Mutalyzer repository and you have push rights there. the upstream Mutalyzer repository and you have push rights there.
1. Start a release branch and make sure the section in the ``CHANGES.rst`` 1. Start a release branch and make sure the section in the ``CHANGES.rst``
...@@ -51,7 +51,7 @@ the upstream Mutalyzer repository and you have push rights there. ...@@ -51,7 +51,7 @@ the upstream Mutalyzer repository and you have push rights there.
Commit and tag the version update:: Commit and tag the version update::
git commit -am 'Bump version to X.Y.Z' git commit -am 'Bump version to X.Y.Z'
git tag -a 'vX.Y.Z' release-X.Y.Z^ git tag -a 'vX.Y.Z'
3. Add a new entry at the top of the ``CHANGES.rst`` file like this:: 3. Add a new entry at the top of the ``CHANGES.rst`` file like this::
...@@ -67,7 +67,7 @@ the upstream Mutalyzer repository and you have push rights there. ...@@ -67,7 +67,7 @@ the upstream Mutalyzer repository and you have push rights there.
4. Push these commits to GitHub:: 4. Push these commits to GitHub::
git push origin release-X.Y.Z -u git push github release-X.Y.Z -u
And submit a pull request for this branch. And submit a pull request for this branch.
...@@ -77,8 +77,12 @@ the upstream Mutalyzer repository and you have push rights there. ...@@ -77,8 +77,12 @@ the upstream Mutalyzer repository and you have push rights there.
:: ::
git push origin vX.Y.Z:release --tags git push github +vX.Y.Z~0:refs/heads/release --tags
git branch -d release-X.Y.Z git branch -d release-X.Y.Z
That last push command might seem a bit cryptic (`it is explained here
<http://stackoverflow.com/a/4061542>`_). It sets the remote branch
`release` to whatever the tag `vX.Y.Z` points to and also pushes all tags.
.. _SemVer: http://semver.org/ .. _SemVer: http://semver.org/
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment