diff options
| author | Emiliano Ruiz Carletti <contact@eruizc.dev> | 2021-04-22 12:10:41 -0300 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2021-06-15 08:31:07 +1000 |
| commit | 40f10c33885439f479d9c6a93c90dd931ff1cf15 (patch) | |
| tree | a83582c7bed54d1f88484681332addc2cf4a9148 /docs | |
| parent | 01e4467d76d1916ae6c495efa6930bb16b9b3a67 (diff) | |
Update config.md
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/Config.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/Config.md b/docs/Config.md index b2baf1255..ff9e17f81 100644 --- a/docs/Config.md +++ b/docs/Config.md @@ -55,7 +55,7 @@ git: # extra args passed to `git merge`, e.g. --no-ff args: '' pull: - mode: 'merge' # one of 'merge' | 'rebase' | 'ff-only' + mode: 'auto' # one of 'auto' | 'merge' | 'rebase' | 'ff-only', auto reads from git configuration skipHookPrefix: WIP autoFetch: true branchLogCmd: 'git log --graph --color=always --abbrev-commit --decorate --date=relative --pretty=medium {{branchName}} --' |