From 40f10c33885439f479d9c6a93c90dd931ff1cf15 Mon Sep 17 00:00:00 2001 From: Emiliano Ruiz Carletti Date: Thu, 22 Apr 2021 12:10:41 -0300 Subject: [PATCH] Update config.md --- docs/Config.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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}} --'