about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2021-06-05 11:24:47 +0000
committerbors <bors@rust-lang.org>2021-06-05 11:24:47 +0000
commite4a1e8524cb3b03e24be800e5abbf5e5a25d268d (patch)
tree21a1daa1dd2632225c2115e36e9178b3913f788a
parent9991040258b838ad90b1f87bb635c62f17268448 (diff)
parent52fc18c932eb9d0836fe2e158b9c689a1f623b79 (diff)
downloadrust-e4a1e8524cb3b03e24be800e5abbf5e5a25d268d.tar.gz
rust-e4a1e8524cb3b03e24be800e5abbf5e5a25d268d.zip
Auto merge of #7321 - flip1995:doc-release-stable-branch, r=xFrednet
Release doc: add explanation for updating the stable branch

r? `@xFrednet`

[Rendered](https://github.com/flip1995/rust-clippy/blob/doc-release-stable-branch/doc/release.md)

changelog: none
-rw-r--r--doc/release.md15
1 files changed, 15 insertions, 0 deletions
diff --git a/doc/release.md b/doc/release.md
index e0af9bf0625..afe3033c288 100644
--- a/doc/release.md
+++ b/doc/release.md
@@ -101,6 +101,21 @@ After this, the release should be available on the Clippy [release page].
 
 [release page]: https://github.com/rust-lang/rust-clippy/releases
 
+## Update the `stable` branch
+
+At this step you should have already checked out the commit of the `rust-1.XX.0`
+tag. Updating the stable branch from here is as easy as:
+
+```bash
+# Assuming the current directory corresponds to the Clippy repository and the
+# commit of the just created rust-1.XX.0 tag is checked out.
+$ git push upstream rust-1.XX.0:stable  # `upstream` is the `rust-lang/rust-clippy` remote
+```
+
+_NOTE: Usually there are no stable backports for Clippy, so this update should
+be possible without force pushing or anything like this. If there should have
+happened a stable backport, make sure to re-merge those changes just as with the
+`beta` branch._
 
 ## Update `CHANGELOG.md`