diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2019-11-05 11:17:52 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2019-11-05 19:22:01 +1100 |
| commit | 1fc120de2d4a28b976920cd3ac5393bf4c040705 (patch) | |
| tree | 3473c225961229127a738c69c4c0e49c6f4b8630 /pkg/commands | |
| parent | d5e443e8e3609fe38586aed942a3dae3343dbe47 (diff) | |
better rebase args
Diffstat (limited to 'pkg/commands')
| -rw-r--r-- | pkg/commands/git.go | 2 |
1 files changed, 1 insertions, 1 deletions
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:]...) |