summaryrefslogtreecommitdiffstats
path: root/pkg/config
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 /pkg/config
parent5ee559b89660cb850040ce41fee242514a09ba8b (diff)
simplify pull logic
Diffstat (limited to 'pkg/config')
-rw-r--r--pkg/config/user_config.go8
1 files changed, 0 insertions, 8 deletions
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}} --",