diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-04-20 18:35:22 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-04-20 18:40:49 +1000 |
| commit | 304607ae5d4b18acaeffaa980b97ba3984ece311 (patch) | |
| tree | 20df3fbf7b596f35fa026b910e947967ce5c527e /docs | |
| parent | e9f28855a246f132aac3575eb484c5219abac3e2 (diff) | |
support configurable merge args
Diffstat (limited to 'docs')
| -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: |