From 8ff74072f89e5ad92a6b1c5c7314b99ac5485d64 Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Tue, 11 Aug 2020 21:21:11 +1000
Subject: [PATCH] update config

---
 docs/Config.md           | 2 ++
 pkg/config/app_config.go | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/docs/Config.md b/docs/Config.md
index c2c320f7c..9de38d3ba 100644
--- a/docs/Config.md
+++ b/docs/Config.md
@@ -41,6 +41,8 @@ Default path for the config file:
       manualCommit: false
       # extra args passed to `git merge`, e.g. --no-ff
       args: ""
+    pull:
+      mode: 'merge' # one of 'merge' | 'rebase' | 'ff-only'
     skipHookPrefix: WIP
     autoFetch: true
     branchLogCmd: "git log --graph --color=always --abbrev-commit --decorate --date=relative --pretty=medium {{branchName}} --"
diff --git a/pkg/config/app_config.go b/pkg/config/app_config.go
index a16fec67d..7ae670d4d 100644
--- a/pkg/config/app_config.go
+++ b/pkg/config/app_config.go
@@ -268,6 +268,8 @@ git:
   merging:
     manualCommit: false
     args: ""
+  pull:
+    mode: 'merge' # one of 'merge' | 'rebase' | 'ff-only'
   skipHookPrefix: 'WIP'
   autoFetch: true
   branchLogCmd: "git log --graph --color=always --abbrev-commit --decorate --date=relative --pretty=medium {{branchName}} --"