Skip to content

Commit 7495854

Browse files
committed
Add a breaking changes hint for the new auto-forward behavior
1 parent eaaa937 commit 7495854

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

pkg/i18n/english.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2139,6 +2139,12 @@ gui:
21392139
"0.44.0": `- The gui.branchColors config option is deprecated; it will be removed in a future version. Please use gui.branchColorPatterns instead.
21402140
- 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.`,
21412141
"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.`,
2142+
"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:
2143+
2144+
git:
2145+
autoForwardBranches: none
2146+
2147+
If, on the other hand, you want this even for feature branches, you can set it to 'allBranches' instead.`,
21422148
},
21432149
}
21442150
}

0 commit comments

Comments
 (0)