go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-01-22 05:29:44 +02:00
Code Issues Releases Activity

support configurable merge args

Browse Source
This commit is contained in:
Jesse Duffield 2020-04-20 18:35:22 +10:00
parent e9f28855a2
commit 304607ae5d
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/Config.md
View File

@ -35,6 +35,8 @@ Default path for the config file:
merging: merging:
# only applicable to unix users # only applicable to unix users
manualCommit: false manualCommit: false
# extra args passed to `git merge`, e.g. --no-ff
args: ""
skipHookPrefix: WIP skipHookPrefix: WIP
autoFetch: true autoFetch: true
update: update:

3
pkg/commands/git.go
View File

@ -410,7 +410,8 @@ func (c *GitCommand) ListStash() (string, error) {
// Merge merge // Merge merge
func (c *GitCommand) Merge(branchName string) error { func (c *GitCommand) Merge(branchName string) error {
return c.OSCommand.RunCommand("git merge --no-edit %s", branchName) mergeArgs := c.Config.GetUserConfig().GetString("git.merging.args")
return c.OSCommand.RunCommand("git merge --no-edit %s %s", mergeArgs, branchName)
} }
// AbortMerge abort merge // AbortMerge abort merge

1
pkg/config/app_config.go
View File

@ -264,6 +264,7 @@ git:
useConfig: false useConfig: false
merging: merging:
manualCommit: false manualCommit: false
args: ""
skipHookPrefix: 'WIP' skipHookPrefix: 'WIP'
autoFetch: true autoFetch: true
update: update: