diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-01-30 18:51:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-30 18:51:22 +0100 |
| commit | 805c6d997b4eb8941e7c2a12879bf9a5284835d0 (patch) | |
| tree | 34555c2e0a76b3b2784b090b7e32ee71e69babae | |
| parent | d38da7b8bec55315697183305cd2412b6c9c5a82 (diff) | |
| parent | 2ed52c299fa382000d33d4fa2eb2727ce4e80455 (diff) | |
| download | podman-805c6d997b4eb8941e7c2a12879bf9a5284835d0.tar.gz podman-805c6d997b4eb8941e7c2a12879bf9a5284835d0.tar.bz2 podman-805c6d997b4eb8941e7c2a12879bf9a5284835d0.zip | |
Merge pull request #2244 from rhatdan/version
Add support for short option -f in podman version
| -rw-r--r-- | cmd/podman/version.go | 2 | ||||
| -rw-r--r-- | completions/bash/podman | 1 | ||||
| -rw-r--r-- | docs/podman-version.1.md | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/cmd/podman/version.go b/cmd/podman/version.go index fd7f06b7c..ce773ee2e 100644 --- a/cmd/podman/version.go +++ b/cmd/podman/version.go @@ -57,7 +57,7 @@ var ( } versionFlags = []cli.Flag{ 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 fa48681ab..e0de4586c 100644 --- a/completions/bash/podman +++ b/completions/bash/podman @@ -2038,6 +2038,7 @@ _podman_version() { " local options_with_args=" --format + -f " local all_options="$options_with_args $boolean_options" diff --git a/docs/podman-version.1.md b/docs/podman-version.1.md index 749a33afd..171096587 100644 --- a/docs/podman-version.1.md +++ b/docs/podman-version.1.md @@ -16,7 +16,7 @@ OS, and Architecture. Print usage statement -**--format** +**--format**, **-f** Change output format to "json" or a Go template. |