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

updated rebase confirmation message

Browse Source
This commit is contained in:
navazjm 2022-12-16 17:36:37 -06:00
parent d69b2fef9a
commit 3a1921cab0
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/i18n/english.go
View File

@ -851,7 +851,7 @@ func EnglishTranslationSet() TranslationSet {
GlobalTitle: "Global Keybindings", GlobalTitle: "Global Keybindings",
ConflictsResolved: "all merge conflicts resolved. Continue?", ConflictsResolved: "all merge conflicts resolved. Continue?",
RebasingTitle: "Rebasing", RebasingTitle: "Rebasing",
ConfirmRebase: "Are you sure you want to rebase '{{.checkedOutBranch}}' onto '{{.selectedBranch}}'?", ConfirmRebase: "Are you sure you want to rebase '{{.checkedOutBranch}}' on top of '{{.selectedBranch}}'?",
ConfirmMerge: "Are you sure you want to merge '{{.selectedBranch}}' into '{{.checkedOutBranch}}'?", ConfirmMerge: "Are you sure you want to merge '{{.selectedBranch}}' into '{{.checkedOutBranch}}'?",
FwdNoUpstream: "Cannot fast-forward a branch with no upstream", FwdNoUpstream: "Cannot fast-forward a branch with no upstream",
FwdNoLocalUpstream: "Cannot fast-forward a branch whose remote is not registered locally", FwdNoLocalUpstream: "Cannot fast-forward a branch whose remote is not registered locally",

2
pkg/integration/tests/branch/rebase.go
View File

@ -24,7 +24,7 @@ var Rebase = NewIntegrationTest(NewIntegrationTestArgs{
input.PressKeys(keys.Branches.RebaseBranch) input.PressKeys(keys.Branches.RebaseBranch)
assert.InConfirm() assert.InConfirm()
assert.MatchCurrentViewContent(Contains("Are you sure you want to rebase 'first-change-branch' onto 'second-change-branch'?")) assert.MatchCurrentViewContent(Contains("Are you sure you want to rebase 'first-change-branch' on top of 'second-change-branch'?"))
input.Confirm() input.Confirm()
assert.InConfirm() assert.InConfirm()

2
pkg/integration/tests/branch/rebase_and_drop.go
View File

@ -27,7 +27,7 @@ var RebaseAndDrop = NewIntegrationTest(NewIntegrationTestArgs{
input.PressKeys(keys.Branches.RebaseBranch) input.PressKeys(keys.Branches.RebaseBranch)
assert.InConfirm() assert.InConfirm()
assert.MatchCurrentViewContent(Contains("Are you sure you want to rebase 'first-change-branch' onto 'second-change-branch'?")) assert.MatchCurrentViewContent(Contains("Are you sure you want to rebase 'first-change-branch' on top of 'second-change-branch'?"))
input.Confirm() input.Confirm()
assert.MatchViewContent("information", Contains("rebasing")) assert.MatchViewContent("information", Contains("rebasing"))