Merge branch 'master' of github.com:wagoodman/dive

This commit is contained in:
Alex Goodman 2019-03-16 11:10:58 -04:00
commit 5459279576
No known key found for this signature in database
GPG Key ID: 743640FAA11698A1
2 changed files with 2 additions and 2 deletions

View File

@ -249,5 +249,5 @@ layer:
dive will search for configs in the following locations:
- `$XDG_CONFIG_HOME/dive/*.yaml`
- `$XDG_CONFIG_DIRS/dive/*.yaml`
- `~/.config/dive.yaml`
- `~/.config/dive/*.yaml`
- `~/.dive.yaml`

View File

@ -41,7 +41,7 @@ func Execute() {
func init() {
cobra.OnInitialize(initConfig)
rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.dive.yaml, ~/.config/dive.yaml, or $XDG_CONFIG_HOME/dive.yaml)")
rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.dive.yaml, ~/.config/dive/*.yaml, or $XDG_CONFIG_HOME/dive.yaml)")
rootCmd.PersistentFlags().BoolP("version", "v", false, "display version number")
rootCmd.Flags().StringVarP(&exportFile, "json", "j", "", "Skip the interactive TUI and write the layer analysis statistics to a given file.")