support configurable merge args

2020-04-20 18:35:22 +10:00
parent e9f28855a2
commit 304607ae5d
3 changed files with 5 additions and 1 deletions
--- 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: