diff options
| author | Naveen Vardhi <vardhi.naveen@gmail.com> | 2018-10-21 21:10:06 +0530 |
|---|---|---|
| committer | Naveen Vardhi <vardhi.naveen@gmail.com> | 2018-10-21 21:13:24 +0530 |
| commit | 3a23cb87b70ebb3c7c82be77a264a0b3499d76c0 (patch) | |
| tree | 01911958bb4741756af0d1fa20f66f4fd1038929 | |
| parent | 59cdd7d46e8a4ad50307b37bcd7fa2eb553cdfb3 (diff) | |
Remove force delete keybinding
And force delete messages gives feedback about merge status
| -rw-r--r-- | pkg/gui/keybindings.go | 6 | ||||
| -rw-r--r-- | pkg/i18n/english.go | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/pkg/gui/keybindings.go b/pkg/gui/keybindings.go index 78271a3f7..4eea64303 100644 --- a/pkg/gui/keybindings.go +++ b/pkg/gui/keybindings.go @@ -303,12 +303,6 @@ func (gui *Gui) GetKeybindings() []*Binding { Description: gui.Tr.SLocalize("deleteBranch"), }, { ViewName: "branches", - Key: 'D', - Modifier: gocui.ModNone, - Handler: gui.handleForceDeleteBranch, - Description: gui.Tr.SLocalize("forceDeleteBranch"), - }, { - ViewName: "branches", Key: 'm', Modifier: gocui.ModNone, Handler: gui.handleMerge, diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index 9ead5a54e..559dbb70c 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -176,7 +176,7 @@ func addEnglish(i18nObject *i18n.Bundle) error { Other: "Are you sure you want to delete the branch {{.selectedBranchName}}?", }, &i18n.Message{ ID: "ForceDeleteBranchMessage", - Other: "Are you sure you want to force delete the branch {{.selectedBranchName}}?", + Other: "{{.selectedBranchName}} is not fully merged. Are you sure you want to delete it?", }, &i18n.Message{ ID: "CantMergeBranchIntoItself", Other: "You cannot merge a branch into itself", |