go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-07 01:09:45 +02:00
Code Issues Releases Activity

Use a better name for the auto-stash for moving a custom patch to index

Browse Source
This commit is contained in:
Stefan Haller
2025-07-03 16:50:53 +02:00
parent 2a7ce19b73
commit 9511ed9d2c
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/commands/git_commands/patch.go
View File

@ -1,6 +1,7 @@
package git_commands package git_commands
import ( import (
"fmt"
"path/filepath" "path/filepath"
"time" "time"
@ -218,7 +219,7 @@ func (self *PatchCommands) MovePatchToSelectedCommit(commits []*models.Commit, s
func (self *PatchCommands) MovePatchIntoIndex(commits []*models.Commit, commitIdx int, stash bool) error { func (self *PatchCommands) MovePatchIntoIndex(commits []*models.Commit, commitIdx int, stash bool) error {
if stash { if stash {
if err := self.stash.Push(self.Tr.StashPrefix + commits[commitIdx].Hash()); err != nil { if err := self.stash.Push(fmt.Sprintf(self.Tr.AutoStashForMovingPatchToIndex, commits[commitIdx].ShortHash())); err != nil {
return err return err
} }
} }

2
pkg/i18n/english.go
View File

@ -451,6 +451,7 @@ type TranslationSet struct {
AutoStashForUndo string AutoStashForUndo string
AutoStashForCheckout string AutoStashForCheckout string
AutoStashForNewBranch string AutoStashForNewBranch string
AutoStashForMovingPatchToIndex string
Discard string Discard string
DiscardChangesTitle string DiscardChangesTitle string
DiscardFileChangesTooltip string DiscardFileChangesTooltip string
@ -1547,6 +1548,7 @@ func EnglishTranslationSet() *TranslationSet {
AutoStashForUndo: "Auto-stashing changes for undoing to %s", AutoStashForUndo: "Auto-stashing changes for undoing to %s",
AutoStashForCheckout: "Auto-stashing changes for checking out %s", AutoStashForCheckout: "Auto-stashing changes for checking out %s",
AutoStashForNewBranch: "Auto-stashing changes for creating new branch %s", AutoStashForNewBranch: "Auto-stashing changes for creating new branch %s",
AutoStashForMovingPatchToIndex: "Auto-stashing changes for moving custom patch to index from %s",
Discard: "Discard", Discard: "Discard",
DiscardFileChangesTooltip: "View options for discarding changes to the selected file.", DiscardFileChangesTooltip: "View options for discarding changes to the selected file.",
DiscardChangesTitle: "Discard changes", DiscardChangesTitle: "Discard changes",