From c942489f24569deb6a2c62a5e6f7e2c75b74e0d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ber=C3=A1nek?= Date: Tue, 7 May 2024 10:52:09 +0200 Subject: [PATCH] Revert "Use a safer command for rebase" --- src/handlers/no_merges.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/handlers/no_merges.rs b/src/handlers/no_merges.rs index 35bbff91..eccdd5ea 100644 --- a/src/handlers/no_merges.rs +++ b/src/handlers/no_merges.rs @@ -88,7 +88,7 @@ so these commits will need to be removed for this pull request to be merged. You can start a rebase with the following commands: ```shell-session $ # rebase -$ git pull --rebase https://github.com/rust-lang/rust.git master +$ git rebase -i master $ # delete any merge commits in the editor that appears $ git push --force-with-lease ``` @@ -228,7 +228,7 @@ There are merge commits (commits with multiple parents) in your changes. We have You can start a rebase with the following commands: ```shell-session $ # rebase -$ git pull --rebase https://github.com/rust-lang/rust.git master +$ git rebase -i master $ # delete any merge commits in the editor that appears $ git push --force-with-lease ```