go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-11-27 22:38:09 +02:00
Code Issues Releases Activity

better typing for rebase mode

Browse Source
This commit is contained in:
Jesse Duffield
2021-12-30 12:10:09 +11:00
parent 9d4ff6b465
commit 1fc0d786ae
4 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/gui/rebase_options_panel.go
View File

@@ -53,7 +53,14 @@ func (gui *Gui) genericMergeCommand(command string) error {
gitCommand := gui.GitCommand.WithSpan(fmt.Sprintf("Merge/Rebase: %s", command))
commandType := strings.Replace(status, "ing", "e", 1)
commandType := ""
switch status {
case commands.REBASE_MODE_MERGING:
commandType = "merge"
case commands.REBASE_MODE_REBASING:
commandType = "rebase"
}
// we should end up with a command like 'git merge --continue'
// it's impossible for a rebase to require a commit so we'll use a subprocess only if it's a merge