summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2021-10-20 22:21:16 +1100
committerJesse Duffield <jessedduffield@gmail.com>2021-10-22 21:33:17 +1100
commit6388af70acda91bf1bdc9cba9f38dc810f49f9ca (patch)
tree1901eb73ccf719c04b99b933a0cc2182e6dd3a0c /docs
parent5ee559b89660cb850040ce41fee242514a09ba8b (diff)
simplify pull logic
Diffstat (limited to 'docs')
-rw-r--r--docs/Config.md2
1 files changed, 0 insertions, 2 deletions
diff --git a/docs/Config.md b/docs/Config.md
index 99c44855b..8f61d1b62 100644
--- a/docs/Config.md
+++ b/docs/Config.md
@@ -59,8 +59,6 @@ git:
manualCommit: false
# extra args passed to `git merge`, e.g. --no-ff
args: ''
- pull:
- 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}} --'