From 6388af70acda91bf1bdc9cba9f38dc810f49f9ca Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Wed, 20 Oct 2021 22:21:16 +1100
Subject: simplify pull logic

---
 pkg/config/user_config.go | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'pkg/config')

diff --git a/pkg/config/user_config.go b/pkg/config/user_config.go
index c4aee9985..06c293d71 100644
--- a/pkg/config/user_config.go
+++ b/pkg/config/user_config.go
@@ -61,7 +61,6 @@ type CommitLengthConfig struct {
 type GitConfig struct {
 	Paging              PagingConfig                  `yaml:"paging"`
 	Merging             MergingConfig                 `yaml:"merging"`
-	Pull                PullConfig                    `yaml:"pull"`
 	SkipHookPrefix      string                        `yaml:"skipHookPrefix"`
 	AutoFetch           bool                          `yaml:"autoFetch"`
 	BranchLogCmd        string                        `yaml:"branchLogCmd"`
@@ -83,10 +82,6 @@ type MergingConfig struct {
 	Args         string `yaml:"args"`
 }
 
-type PullConfig struct {
-	Mode string `yaml:"mode"`
-}
-
 type CommitPrefixConfig struct {
 	Pattern string `yaml:"pattern"`
 	Replace string `yaml:"replace"`
@@ -341,9 +336,6 @@ func GetDefaultConfig() *UserConfig {
 				ManualCommit: false,
 				Args:         "",
 			},
-			Pull: PullConfig{
-				Mode: "auto",
-			},
 			SkipHookPrefix:      "WIP",
 			AutoFetch:           true,
 			BranchLogCmd:        "git log --graph --color=always --abbrev-commit --decorate --date=relative --pretty=medium {{branchName}} --",
-- 
cgit v1.2.3