From 0083ae8732e4b5d6911729b5e60c99a19d6179ac Mon Sep 17 00:00:00 2001
From: Joe Richey <joerichey@google.com>
Date: Mon, 9 Jan 2017 15:57:49 -0800
Subject: [PATCH] Usage/Description/ArgsUsage correctly copied when using
 subcommand

---
 command.go | 8 +++-----
 help.go    | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/command.go b/command.go
index 2628fbf..68c760e 100644
--- a/command.go
+++ b/command.go
@@ -230,11 +230,9 @@ func (c Command) startApp(ctx *Context) error {
 		app.HelpName = app.Name
 	}
 
-	if c.Description != "" {
-		app.Usage = c.Description
-	} else {
-		app.Usage = c.Usage
-	}
+	app.Usage = c.Usage
+	app.Description = c.Description
+	app.ArgsUsage = c.ArgsUsage
 
 	// set CommandNotFound
 	app.CommandNotFound = ctx.App.CommandNotFound
diff --git a/help.go b/help.go
index c8c1aee..d00e4da 100644
--- a/help.go
+++ b/help.go
@@ -64,7 +64,7 @@ OPTIONS:
 // cli.go uses text/template to render templates. You can
 // render custom help text by setting this variable.
 var SubcommandHelpTemplate = `NAME:
-   {{.HelpName}} - {{.Usage}}
+   {{.HelpName}} - {{if .Description}}{{.Description}}{{else}}{{.Usage}}{{end}}
 
 USAGE:
    {{.HelpName}} command{{if .VisibleFlags}} [command options]{{end}} {{if .ArgsUsage}}{{.ArgsUsage}}{{else}}[arguments...]{{end}}