Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

better squash description #1260

Merged
merged 1 commit into from
Apr 12, 2021
Merged

better squash description #1260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkg/i18n/english.go
View file
Open in desktop
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
View file
Open in desktop
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