11cf86f397a12e48a6be8d48c21e5a700efe8426

 1diff --git a/server/cmd/cmd.go b/server/cmd/cmd.go
 2index e71ab65357ed0978b0a65bc9c6f77e3167da9941..157a1c2bbbe82fd3f0d3b398e2050fe4c4281e20 100644
 3--- a/server/cmd/cmd.go
 4+++ b/server/cmd/cmd.go
 5@@ -16,9 +16,9 @@ var (
 6 	// ErrFileNotFound is returned when the file is not found.
 7 	ErrFileNotFound = fmt.Errorf("File not found")
 8 
 9-	usageTemplate = `Usage:{{if .Runnable}}
10-  {{.UseLine}}{{end}}{{if .HasAvailableSubCommands}}
11-  {{.UseLine}} [command]{{end}}{{if gt (len .Aliases) 0}}
12+	usageTemplate = `Usage:{{if .Runnable}}{{if .HasParent }}
13+  {{.Parent.Use}} {{end}}{{.Use}}{{if .HasAvailableFlags }} [flags]{{end}}{{end}}{{if .HasAvailableSubCommands}}
14+  {{if .HasParent }}{{.Parent.Use}} {{end}}{{.Use}} [command]{{end}}{{if gt (len .Aliases) 0}}
15 
16 Aliases:
17   {{.NameAndAliases}}{{end}}{{if .HasExample}}