mirrors/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-12 04:45:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Rebase merges by default

Browse source
This commit is contained in:
Luka Markušić 2022-09-10 07:35:10 +02:00
parent 90feb4bae6
commit 41f86f6535
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pkg/commands/git_commands/rebase.go
View file

@ -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,
),
),