support configurable merge args

jesseduffield · Apr 20, 2020 · 304607a · 304607a
1 parent e9f2885
commit 304607a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/docs/Config.md b/docs/Config.md
@@ -35,6 +35,8 @@ Default path for the config file:
     merging:
       # only applicable to unix users
       manualCommit: false
+      # extra args passed to `git merge`, e.g. --no-ff
+      args: ""
     skipHookPrefix: WIP
     autoFetch: true
   update:

diff --git a/pkg/commands/git.go b/pkg/commands/git.go
@@ -410,7 +410,8 @@ func (c *GitCommand) ListStash() (string, error) {
 
 // Merge merge
 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

diff --git a/pkg/config/app_config.go b/pkg/config/app_config.go
@@ -264,6 +264,7 @@ git:
     useConfig: false
   merging:
     manualCommit: false
+    args: ""
   skipHookPrefix: 'WIP'
   autoFetch: true
 update: