summaryrefslogtreecommitdiffstats
path: root/pkg/config/app_config.go
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2020-04-20 18:35:22 +1000
committerJesse Duffield <jessedduffield@gmail.com>2020-04-20 18:40:49 +1000
commit304607ae5d4b18acaeffaa980b97ba3984ece311 (patch)
tree20df3fbf7b596f35fa026b910e947967ce5c527e /pkg/config/app_config.go
parente9f28855a246f132aac3575eb484c5219abac3e2 (diff)
support configurable merge args
Diffstat (limited to 'pkg/config/app_config.go')
-rw-r--r--pkg/config/app_config.go1
1 files changed, 1 insertions, 0 deletions
diff --git a/pkg/config/app_config.go b/pkg/config/app_config.go
index 76f2fb76f..f3824c5f1 100644
--- a/pkg/config/app_config.go
+++ b/pkg/config/app_config.go
@@ -264,6 +264,7 @@ git:
useConfig: false
merging:
manualCommit: false
+ args: ""
skipHookPrefix: 'WIP'
autoFetch: true
update: