Merge branch 'next' into next

This commit is contained in:
Ben Hilburn 2017-06-02 12:09:35 -04:00 committed by GitHub
commit e09d4ae926
6 changed files with 126 additions and 0 deletions

View file

@ -139,6 +139,7 @@ The segments that are currently available are:
* [`aws`](#aws) - The current AWS profile, if active.
* `aws_eb_env` - The current Elastic Beanstalk Environment.
* `docker_machine` - The current Docker Machine.
* `kubecontext` - The current context of your `kubectl` configuration.
**Other:**
* [`custom_command`](#custom_command) - Create a custom segment to display the