summaryrefslogtreecommitdiffstats
path: root/pkg/config
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2019-02-16 21:01:17 +1100
committerJesse Duffield <jessedduffield@gmail.com>2019-02-16 21:01:17 +1100
commite011e9bc4238b97a70ac6e4b35a862a028ce55e4 (patch)
treeb4812f422ee3b38844796617299a5cecc7835369 /pkg/config
parentad93b4c863dfaa6a1cb6bb740d0dba87fef14404 (diff)
more work on rebasing feature
Diffstat (limited to 'pkg/config')
-rw-r--r--pkg/config/app_config.go3
1 files changed, 3 insertions, 0 deletions
diff --git a/pkg/config/app_config.go b/pkg/config/app_config.go
index 18aa961bc..b5052fc12 100644
--- a/pkg/config/app_config.go
+++ b/pkg/config/app_config.go
@@ -239,6 +239,9 @@ func GetDefaultConfig() []byte {
- blue
commitLength:
show: true
+ git:
+ merging:
+ manualCommit: false
update:
method: prompt # can be: prompt | background | never
days: 14 # how often a update is checked for