From 7ff07e145474b1ef3465db94dd57c0aa82353bfb Mon Sep 17 00:00:00 2001 From: Peter Lundberg Date: Sun, 7 Apr 2019 01:10:58 +0200 Subject: Always include atleast 2 commits when doing squash and fixup --- pkg/i18n/dutch.go | 3 +++ pkg/i18n/english.go | 3 +++ pkg/i18n/polish.go | 3 +++ 3 files changed, 9 insertions(+) (limited to 'pkg/i18n') diff --git a/pkg/i18n/dutch.go b/pkg/i18n/dutch.go index a7c6efd23..3da767bf3 100644 --- a/pkg/i18n/dutch.go +++ b/pkg/i18n/dutch.go @@ -565,6 +565,9 @@ func addDutch(i18nObject *i18n.Bundle) error { }, &i18n.Message{ ID: "CannotRebaseOntoFirstCommit", Other: "You cannot interactive rebase onto the first commit", + }, &i18n.Message{ + ID: "CannotSquashOntoSecondCommit", + Other: "You cannot squash/fixup onto the second commit", }, &i18n.Message{ ID: "Donate", Other: "Donate", diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index b64cc582f..3b61ac3a7 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -588,6 +588,9 @@ func addEnglish(i18nObject *i18n.Bundle) error { }, &i18n.Message{ ID: "CannotRebaseOntoFirstCommit", Other: "You cannot interactive rebase onto the first commit", + }, &i18n.Message{ + ID: "CannotSquashOntoSecondCommit", + Other: "You cannot squash/fixup onto the second commit", }, &i18n.Message{ ID: "Donate", Other: "Donate", diff --git a/pkg/i18n/polish.go b/pkg/i18n/polish.go index fc17323b9..372f4c090 100644 --- a/pkg/i18n/polish.go +++ b/pkg/i18n/polish.go @@ -548,6 +548,9 @@ func addPolish(i18nObject *i18n.Bundle) error { }, &i18n.Message{ ID: "CannotRebaseOntoFirstCommit", Other: "You cannot interactive rebase onto the first commit", + }, &i18n.Message{ + ID: "CannotSquashOntoSecondCommit", + Other: "You cannot squash/fixup onto the second commit", }, &i18n.Message{ ID: "Donate", Other: "Donate", -- cgit v1.2.3