From 1fc120de2d4a28b976920cd3ac5393bf4c040705 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Tue, 5 Nov 2019 11:17:52 +1100 Subject: better rebase args --- pkg/commands/git.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkg/commands') diff --git a/pkg/commands/git.go b/pkg/commands/git.go index 815c84423..f9f6e723d 100644 --- a/pkg/commands/git.go +++ b/pkg/commands/git.go @@ -726,7 +726,7 @@ func (c *GitCommand) PrepareInteractiveRebaseCommand(baseSha string, todo string 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:]...) -- cgit v1.2.3