summaryrefslogtreecommitdiffstats
path: root/pkg/config
diff options
context:
space:
mode:
authorStefan Haller <stefan@haller-berlin.de>2023-06-30 08:42:39 +0200
committerStefan Haller <stefan@haller-berlin.de>2023-09-04 16:52:30 +0200
commit6266e196232b6dab6181ca33da90b6dff3732da1 (patch)
treed76871437d1fa8bd9bc6541e3d4dfbdbe884bab7 /pkg/config
parentc67aa49856cf7ffaac7665237a3c3b0af40358fd (diff)
Add support for external diff commands (e.g. difftastic)
Diffstat (limited to 'pkg/config')
-rw-r--r--pkg/config/user_config.go14
1 files changed, 8 insertions, 6 deletions
diff --git a/pkg/config/user_config.go b/pkg/config/user_config.go
index 43bbe05ee..0acfcfb9b 100644
--- a/pkg/config/user_config.go
+++ b/pkg/config/user_config.go
@@ -101,9 +101,10 @@ type GitConfig struct {
}
type PagingConfig struct {
- ColorArg string `yaml:"colorArg"`
- Pager string `yaml:"pager"`
- UseConfig bool `yaml:"useConfig"`
+ ColorArg string `yaml:"colorArg"`
+ Pager string `yaml:"pager"`
+ UseConfig bool `yaml:"useConfig"`
+ ExternalDiffCommand string `yaml:"externalDiffCommand"`
}
type CommitConfig struct {
@@ -469,9 +470,10 @@ func GetDefaultConfig() *UserConfig {
},
Git: GitConfig{
Paging: PagingConfig{
- ColorArg: "always",
- Pager: "",
- UseConfig: false,
+ ColorArg: "always",
+ Pager: "",
+ UseConfig: false,
+ ExternalDiffCommand: "",
},
Commit: CommitConfig{
SignOff: false,