From 4619bb243db71309f1c0a619347995560d3dd20b Mon Sep 17 00:00:00 2001
From: flip1995 <hello@philkrones.com>
Date: Thu, 23 Apr 2020 20:14:06 +0200
Subject: [PATCH 1/3] Add a note to the beta sections of release.md

---
 doc/release.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/release.md b/doc/release.md
index 25ddff4c48ca..f16ddb375da3 100644
--- a/doc/release.md
+++ b/doc/release.md
@@ -63,6 +63,9 @@ to the beta Rust release. The remerge is then necessary, to make sure that the
 Clippy commit, that was used by the now stable Rust release, persists in the
 tree of the Clippy repository.
 
+To find out if this step is necessary run `git branch master --contains beta`.
+If this command outputs `master`, this step is **not** necessary.
+
 ```bash
 # Assuming `HEAD` is the current `master` branch of rust-lang/rust-clippy
 $ git checkout -b backport_remerge

From c19ca0e8a8d6b8e04d635af617a80cf63aed1abc Mon Sep 17 00:00:00 2001
From: flip1995 <hello@philkrones.com>
Date: Thu, 23 Apr 2020 20:34:30 +0200
Subject: [PATCH 2/3] The beta branch update should not require a force push

---
 doc/release.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/release.md b/doc/release.md
index f16ddb375da3..12bfe5a1487e 100644
--- a/doc/release.md
+++ b/doc/release.md
@@ -100,5 +100,5 @@ be updated.
 # Assuming the current directory corresponds to the Clippy repository
 $ git checkout beta
 $ git rebase $BETA_SHA
-$ git push upstream beta [-f]   # This requires a force push, if a remerge was done
+$ git push upstream beta
 ```

From 451badeddf0c7ea13353bdd3f3fa3cf690bc22d9 Mon Sep 17 00:00:00 2001
From: flip1995 <hello@philkrones.com>
Date: Thu, 23 Apr 2020 23:24:58 +0200
Subject: [PATCH 3/3] Run fetch before testing if master contains beta

---
 doc/release.md | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/doc/release.md b/doc/release.md
index 12bfe5a1487e..9d69fa8a7f69 100644
--- a/doc/release.md
+++ b/doc/release.md
@@ -63,7 +63,14 @@ to the beta Rust release. The remerge is then necessary, to make sure that the
 Clippy commit, that was used by the now stable Rust release, persists in the
 tree of the Clippy repository.
 
-To find out if this step is necessary run `git branch master --contains beta`.
+To find out if this step is necessary run
+
+```bash
+# Assumes that the local master branch is up-to-date
+$ git fetch upstream
+$ git branch master --contains upstream/beta
+```
+
 If this command outputs `master`, this step is **not** necessary.
 
 ```bash