Skip to content

Commit

Permalink
better squash description
Browse files Browse the repository at this point in the history
  • Loading branch information
jesseduffield committed Apr 12, 2021
1 parent 4fb2dba commit 7d195b9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions pkg/i18n/english.go
Original file line number Diff line number Diff line change
Expand Up @@ -1026,8 +1026,8 @@ func englishTranslationSet() TranslationSet {
LcHardResetUpstream: "hard reset to upstream branch",
LcViewResetOptions: `view reset options`,
LcCreateFixupCommit: `create fixup commit for this commit`,
LcSquashAboveCommits: `squash above commits`,
SquashAboveCommits: `Squash above commits`,
LcSquashAboveCommits: `squash all 'fixup!' commits above selected commit (autosquash)`,
SquashAboveCommits: `Squash all 'fixup!' commits above selected commit (autosquash)`,
SureSquashAboveCommits: `Are you sure you want to squash all fixup! commits above {{.commit}}?`,
CreateFixupCommit: `Create fixup commit`,
SureCreateFixupCommit: `Are you sure you want to create a fixup! commit for commit {{.commit}}?`,
Expand Down
4 changes: 2 additions & 2 deletions pkg/i18n/polish.go
Original file line number Diff line number Diff line change
Expand Up @@ -225,8 +225,8 @@ func polishTranslationSet() TranslationSet {
LcHardReset: "hard reset",
LcViewResetOptions: `view reset options`,
LcCreateFixupCommit: `create fixup commit for this commit`,
LcSquashAboveCommits: `squash above commits`,
SquashAboveCommits: `Squash above commits`,
LcSquashAboveCommits: `squash all 'fixup!' commits above selected commits (autosquash)`,
SquashAboveCommits: `Squash all 'fixup!' commits above selected commits (autosquash)`,
SureSquashAboveCommits: `Are you sure you want to squash all fixup! commits above {{.commit}}?`,
CreateFixupCommit: `Create fixup commit`,
SureCreateFixupCommit: `Are you sure you want to create a fixup! commit for commit {{.commit}}?`,
Expand Down

0 comments on commit 7d195b9

Please sign in to comment.