go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-13 22:17:05 +02:00
Code Issues Releases Activity

better rebase args

Browse Source
This commit is contained in:
Jesse Duffield 2019-11-05 11:17:52 +11:00
parent d5e443e8e3
commit 1fc120de2d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/commands/git.go
View File

@ -726,7 +726,7 @@ func (c *GitCommand) PrepareInteractiveRebaseCommand(baseSha string, todo string
debug = "TRUE" debug = "TRUE"
} }
splitCmd := str.ToArgv(fmt.Sprintf("git rebase --interactive --autostash %s", baseSha)) splitCmd := str.ToArgv(fmt.Sprintf("git rebase --interactive --autostash --keep-empty --rebase-merges %s", baseSha))
cmd := c.OSCommand.command(splitCmd[0], splitCmd[1:]...) cmd := c.OSCommand.command(splitCmd[0], splitCmd[1:]...)