diff options
Diffstat (limited to 'docs/Config.md')
| -rw-r--r-- | docs/Config.md | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/docs/Config.md b/docs/Config.md index 0362c4a86..3d9caba36 100644 --- 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: |