1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-11-29 22:48:24 +02:00

Merge branch 'master' into feature/anonymous-reporting

This commit is contained in:
Jesse Duffield
2018-08-27 18:50:24 +10:00
12 changed files with 408 additions and 98 deletions

View File

@@ -101,7 +101,7 @@ func LoadUserConfig() (*viper.Viper, error) {
// LoadDefaultConfig loads in the defaults defined in this file
func LoadDefaultConfig(v *viper.Viper) error {
defaults := getDefaultConfig()
defaults := GetDefaultConfig()
return v.ReadConfig(bytes.NewBuffer(defaults))
}
@@ -139,10 +139,10 @@ func (c *AppConfig) InsertToUserConfig(key, value string) error {
return v.WriteConfig()
}
func getDefaultConfig() []byte {
return []byte(`
gui:
## stuff relating to the UI
func GetDefaultConfig() []byte {
return []byte(
`gui:
# stuff relating to the UI
scrollHeight: 2
theme:
activeBorderColor: