diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-11 21:21:11 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-12 18:47:16 +1000 |
| commit | 8ff74072f89e5ad92a6b1c5c7314b99ac5485d64 (patch) | |
| tree | e7ff7e608ec0feeb29c601175b096f2bb0be6e16 | |
| parent | fcd5aea04e9799f8cf078b4fe4c6b242a8c9b474 (diff) | |
update config
| -rw-r--r-- | docs/Config.md | 2 | ||||
| -rw-r--r-- | pkg/config/app_config.go | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/docs/Config.md b/docs/Config.md index c2c320f7c..9de38d3ba 100644 --- a/docs/Config.md +++ b/docs/Config.md @@ -41,6 +41,8 @@ Default path for the config file: manualCommit: false # extra args passed to `git merge`, e.g. --no-ff 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}} --" 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}} --" |