diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2021-04-12 21:49:08 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2021-04-12 21:57:13 +1000 |
| commit | 7d195b97c2b3a575884c474610c9f7ed66e26400 (patch) | |
| tree | 53790ebe940e4491e93f157bf10f931144c1cc1a | |
| parent | 4fb2dba5870deb5c8b8f4cba494bc1d51df64762 (diff) | |
better squash description
| -rw-r--r-- | pkg/i18n/english.go | 4 | ||||
| -rw-r--r-- | pkg/i18n/polish.go | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index 8036cd720..83e34de5e 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -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}}?`, diff --git a/pkg/i18n/polish.go b/pkg/i18n/polish.go index a7ea87298..9234c2a70 100644 --- a/pkg/i18n/polish.go +++ b/pkg/i18n/polish.go @@ -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}}?`, |