mirrors/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-10 20:05:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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
docs/Config.md
View file

@ -305,6 +305,12 @@ git:
# If true, pass the --all arg to git fetch
fetchAll: true
# 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: true
# Command used when displaying the current branch git log in the main window
branchLogCmd: git log --graph --color=always --abbrev-commit --decorate --date=relative --pretty=medium {{branchName}} --