From 74958542432553c68f8ab784dde01a42031bce0c Mon Sep 17 00:00:00 2001 From: Stefan Haller Date: Fri, 18 Apr 2025 14:58:06 +0200 Subject: [PATCH] Add a breaking changes hint for the new auto-forward behavior --- pkg/i18n/english.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index 85903dd96..3b961e7d1 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -2139,6 +2139,12 @@ gui: "0.44.0": `- The gui.branchColors config option is deprecated; it will be removed in a future version. Please use gui.branchColorPatterns instead. - The automatic coloring of branches starting with "feature/", "bugfix/", or "hotfix/" has been removed; if you want this, it's easy to set up using the new gui.branchColorPatterns option.`, "0.49.0": `- Executing shell commands (with the ':' prompt) no longer uses an interactive shell, which means that if you want to use your shell aliases in this prompt, you need to do a little bit of setup work. See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#using-aliases-or-functions-in-shell-commands for details.`, + "0.50.0": `- After fetching, main branches now get auto-forwarded to their upstream if they fall behind. This is useful for keeping your main or master branch up to date automatically. If you don't want this, you can disable it by setting the following in your config: + +git: + autoForwardBranches: none + +If, on the other hand, you want this even for feature branches, you can set it to 'allBranches' instead.`, }, } }