diff options
| author | Luka Markušić <luka.markusic@microblink.com> | 2022-09-10 07:35:10 +0200 |
|---|---|---|
| committer | Luka Markušić <luka.markusic@microblink.com> | 2022-09-24 23:37:17 +0200 |
| commit | 41f86f65353e2e73545103ebcf87d86e29d08a1e (patch) | |
| tree | 37ac1e2b041bf3890683a8a2ac39f9df5207561d /pkg/commands | |
| parent | 90feb4bae6bf914f70958c30fd639aeb5b7e927d (diff) | |
Rebase merges by default
Diffstat (limited to 'pkg/commands')
| -rw-r--r-- | pkg/commands/git_commands/rebase.go | 2 |
1 files changed, 1 insertions, 1 deletions
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, ), ), |