From a34d2d92a6977bc9f95fb76d833dd94851319c81 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Mon, 12 Apr 2021 21:49:08 +1000 Subject: [PATCH] better squash description --- pkg/i18n/english.go | 4 ++-- 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 8036cd720e9..83e34de5ebd 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 a7ea8729840..9234c2a70a7 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}}?`,