diff options
| author | Stefan Haller <stefan@haller-berlin.de> | 2023-03-04 18:11:17 +0100 |
|---|---|---|
| committer | Stefan Haller <stefan@haller-berlin.de> | 2023-04-01 08:16:15 +0200 |
| commit | c757063264d5386a67a22d88f6283dbbf1d09223 (patch) | |
| tree | 21cefa7d4d3481cc6b9e1e1fd7245138c5d0052a /pkg/i18n | |
| parent | b24955063c71f6cb600be8636564144c496fe46a (diff) | |
Better error message when trying to edit or move a non-todo commit during rebase
Previously we would have tried to do the rebase, resulting in a long and
somewhat cryptic error message from git; now we check ourselves and show a less
intimidating message.
Diffstat (limited to 'pkg/i18n')
| -rw-r--r-- | pkg/i18n/english.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index ed89592e8..86ba0451c 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -190,6 +190,7 @@ type TranslationSet struct { PickAllHunks string ViewMergeRebaseOptions string NotMergingOrRebasing string + AlreadyRebasing string RecentRepos string MergeOptionsTitle string RebaseOptionsTitle string @@ -839,6 +840,7 @@ func EnglishTranslationSet() TranslationSet { PickAllHunks: "pick all hunks", ViewMergeRebaseOptions: "view merge/rebase options", NotMergingOrRebasing: "You are currently neither rebasing nor merging", + AlreadyRebasing: "Can't perform this action during a rebase", RecentRepos: "recent repositories", MergeOptionsTitle: "Merge Options", RebaseOptionsTitle: "Rebase Options", |