Merge pull request #2564 from rhatdan/cleanup

Fix help commands to show short and long description.

1 files changed, 12 insertions, 0 deletions

diff --git a/cmd/podman/common.go b/cmd/podman/common.go
index c9e937825..9cd1998c8 100644
--- a/cmd/podman/common.go
+++ b/cmd/podman/common.go
@@ -521,6 +521,18 @@ func scrubServer(server string) string {
 	return strings.TrimPrefix(server, "http://")
 }
 
+// HelpTemplate returns the help template for podman commands
+// This uses the short and long options.
+// command should not use this.
+func HelpTemplate() string {
+	return `{{.Short}}
+
+Description:
+  {{.Long}}
+
+{{if or .Runnable .HasSubCommands}}{{.UsageString}}{{end}}`
+}
+
 // UsageTemplate returns the usage template for podman commands
 // This blocks the desplaying of the global options. The main podman
 // command should not use this.