diff options
Diffstat (limited to 'pkg/config')
| -rw-r--r-- | pkg/config/app_config.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkg/config/app_config.go b/pkg/config/app_config.go index a16fec67d..7ae670d4d 100644 --- a/pkg/config/app_config.go +++ b/pkg/config/app_config.go @@ -268,6 +268,8 @@ git: merging: manualCommit: false args: "" + pull: + mode: 'merge' # one of 'merge' | 'rebase' | 'ff-only' skipHookPrefix: 'WIP' autoFetch: true branchLogCmd: "git log --graph --color=always --abbrev-commit --decorate --date=relative --pretty=medium {{branchName}} --" |