aboutsummaryrefslogtreecommitdiffstats
path: root/plumbing/format/config/merged.go
Commit message (Expand)AuthorAgeFilesLines
* Revert "Merge pull request #20 from quorumcontrol/feature/other-configs"Máximo Cuadros2020-05-241-261/+0
* Document some things in format/config/merged.goWes Morgan2020-04-071-1/+39
* Add funcs to set global & local config in MergedWes Morgan2020-04-061-0/+8
* Add Merged configWes Morgan2020-04-061-0/+215