Skip to content

Use a safer command for rebase #1808

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jackh726 merged 1 commit into from
May 6, 2024
Merged

Use a safer command for rebase #1808

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/handlers/no_merges.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 rebase -i master
$ git pull --rebase https://github.com/rust-lang/rust.git master
$ # delete any merge commits in the editor that appears
$ git push --force-with-lease
```
Expand Down Expand Up @@ -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 rebase -i master
$ git pull --rebase https://github.com/rust-lang/rust.git master
$ # delete any merge commits in the editor that appears
$ git push --force-with-lease
```
Expand Down