diff --git a/pkg/commands/git_commands/rebase.go b/pkg/commands/git_commands/rebase.go index 9a8f94618..11c187f36 100644 --- a/pkg/commands/git_commands/rebase.go +++ b/pkg/commands/git_commands/rebase.go @@ -255,7 +255,7 @@ func (self *RebaseCommands) SquashAllAboveFixupCommits(sha string) error { return self.runSkipEditorCommand( self.cmd.New( fmt.Sprintf( - "git rebase --interactive --autostash --autosquash %s^", + "git rebase --interactive --rebase-merges --autostash --autosquash %s^", sha, ), ),