diff options
Diffstat (limited to 'pkg/commands/git.go')
| -rw-r--r-- | pkg/commands/git.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkg/commands/git.go b/pkg/commands/git.go index 5958886c3..f996c01b5 100644 --- 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 |