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

Explicitly pass --no-autosquash when rebasing

Browse source 
This fixes the problem shown in the previous commit.
This commit is contained in:
stk 2023-02-09 18:21:11 +01:00
parent e357c00d4d
commit 1da762c295
3 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -129,7 +129,7 @@ func (self *RebaseCommands) PrepareInteractiveRebaseCommand(baseSha string, todo
debug = "TRUE"
}
cmdStr := fmt.Sprintf("git rebase --interactive --autostash --keep-empty %s", baseSha)
cmdStr := fmt.Sprintf("git rebase --interactive --autostash --keep-empty --no-autosquash %s", baseSha)
self.Log.WithField("command", cmdStr).Debug("RunCommand")
cmdObj := self.cmd.New(cmdStr)