sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-31 14:24:25 +03:00
Code Activity

Add config git.autoStageResolvedConflicts

Browse Source
This commit is contained in:
Stefan Haller
2024-08-28 22:18:31 +02:00
parent 1191aca60f
commit 90b8fd242d
6 changed files with 124 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/config/user_config.go
View File

@ -224,6 +224,11 @@ type GitConfig struct {
AutoRefresh bool `yaml:"autoRefresh"`
// If true, pass the --all arg to git fetch
FetchAll bool `yaml:"fetchAll"`
// If true, lazygit will automatically stage files that used to have merge
// conflicts but no longer do; and it will also ask you if you want to
// continue a merge or rebase if you've resolved all conflicts. If false, it
// won't do either of these things.
AutoStageResolvedConflicts bool `yaml:"autoStageResolvedConflicts"`
// Command used when displaying the current branch git log in the main window
BranchLogCmd string `yaml:"branchLogCmd"`
// Command used to display git log of all branches in the main window.
@ -753,6 +758,7 @@ func GetDefaultConfig() *UserConfig {
AutoFetch: true,
AutoRefresh: true,
FetchAll: true,
AutoStageResolvedConflicts: true,
BranchLogCmd: "git log --graph --color=always --abbrev-commit --decorate --date=relative --pretty=medium {{branchName}} --",
AllBranchesLogCmd: "git log --graph --all --color=always --abbrev-commit --decorate --date=relative --pretty=medium",
DisableForcePushing: false,