diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-01-30 17:00:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-30 17:00:52 +0100 |
| commit | 68858211ce999bca0590dd4ced9d02e675bca9c6 (patch) | |
| tree | b653c428a767052e18807154762faa4833bace70 | |
| parent | b71088a01e1e43b87214aaca87c73865fa3b990e (diff) | |
| parent | 9e340da255bd45a171cd35afb21fb320fb42f7ff (diff) | |
| download | podman-68858211ce999bca0590dd4ced9d02e675bca9c6.tar.gz podman-68858211ce999bca0590dd4ced9d02e675bca9c6.tar.bz2 podman-68858211ce999bca0590dd4ced9d02e675bca9c6.zip | |
Merge pull request #2242 from rhatdan/info
Add support for short option -f
| -rw-r--r-- | cmd/podman/info.go | 2 | ||||
| -rw-r--r-- | completions/bash/podman | 1 | ||||
| -rw-r--r-- | docs/podman-info.1.md | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/cmd/podman/info.go b/cmd/podman/info.go index 3888829a3..f5f91b603 100644 --- a/cmd/podman/info.go +++ b/cmd/podman/info.go @@ -29,7 +29,7 @@ var ( Usage: "display additional debug information", }, cli.StringFlag{ - Name: "format", + Name: "format, f", Usage: "Change the output format to JSON or a Go template", }, } diff --git a/completions/bash/podman b/completions/bash/podman index 9ef1d1a0d..e84c25117 100644 --- a/completions/bash/podman +++ b/completions/bash/podman @@ -1219,6 +1219,7 @@ _podman_info() { --debug " local options_with_args=" + -f --format " diff --git a/docs/podman-info.1.md b/docs/podman-info.1.md index 836a2c420..d3a0658c9 100644 --- a/docs/podman-info.1.md +++ b/docs/podman-info.1.md @@ -19,7 +19,7 @@ Displays information pertinent to the host, current storage stats, configured co Show additional information -**--format** +**--format, -f** Change output format to "json" or a Go template. |