summaryrefslogtreecommitdiffstats
path: root/pkg/config
diff options
context:
space:
mode:
authorEmiliano Ruiz Carletti <contact@eruizc.dev>2021-04-18 18:07:13 -0300
committerJesse Duffield <jessedduffield@gmail.com>2021-06-15 08:31:07 +1000
commitc57a0077d043bc0ecd3f4c8e0988c46655eecb94 (patch)
tree81cbf62f0668508f7f3b65a8dcb6cd82789009d9 /pkg/config
parent46e500dc28e6ca030214f729f3e6954557019cf9 (diff)
Read pull mode from gitconfig lazily
Diffstat (limited to 'pkg/config')
-rw-r--r--pkg/config/user_config.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/config/user_config.go b/pkg/config/user_config.go
index 1312e4bd8..e7231a55b 100644
--- a/pkg/config/user_config.go
+++ b/pkg/config/user_config.go
@@ -323,7 +323,7 @@ func GetDefaultConfig() *UserConfig {
Args: "",
},
Pull: PullConfig{
- Mode: "merge",
+ Mode: "auto",
},
SkipHookPrefix: "WIP",
AutoFetch: true,