Merge pull request #742 from Kobzol/rebase

Kobzol · web-flow · commit d3a264b178cd · 2024-05-27T22:07:14.000+02:00
Use a safer command for rebasing
diff --git a/src/triagebot/no-merge.md b/src/triagebot/no-merge.md
@@ -39,8 +39,7 @@ There are three optional values that can be specified in the table:
 > 
 > ```shell-session
 > $ # rebase
-> $ git rebase -i master
-> $ # delete any merge commits in the editor that appears
+> $ git pull --rebase https://github.com/rust-lang/rust.git master
 > $ git push --force-with-lease
 > ```
 

Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,7 @@ There are three optional values that can be specified in the table:`
`39`	`39`	`>`
`40`	`40`	> ```shell-session
`41`	`41`	`> $ # rebase`
`42`		`-> $ git rebase -i master`
`43`		`-> $ # delete any merge commits in the editor that appears`
	`42`	`+> $ git pull --rebase https://github.com/rust-lang/rust.git master`
`44`	`43`	`> $ git push --force-with-lease`
`45`	`44`	> ```
`46`	`45`