diff --git a/bug/bug.go b/bug/bug.go
index f536716e53fd6baeb4c844f3c3d9e823db845772..a82ee37129ee28b99564d089b1a742143787acaf 100644
--- a/bug/bug.go
+++ b/bug/bug.go
@@ -34,7 +34,7 @@ type Bug struct {
 
 // Create a new Bug
 func NewBug() (*Bug, error) {
-	// TODO: replace with simple random bytes + hash
+	// TODO: replace with commit hash of (first commit + some random)
 
 	// Creating UUID Version 4
 	unique, err := uuid.ID4()
diff --git a/commands/command.go b/commands/command.go
new file mode 100644
index 0000000000000000000000000000000000000000..30298d3fa7ce6b09b243a2ba4fbfba2bacc3b9d2
--- /dev/null
+++ b/commands/command.go
@@ -0,0 +1,54 @@
+// Package commands contains the assorted sub commands supported by the git-bug tool.
+package commands
+
+import (
+	"flag"
+	"fmt"
+	"github.com/MichaelMure/git-bug/repository"
+)
+
+const messageFilename = "BUG_MESSAGE_EDITMSG"
+
+// Command represents the definition of a single command.
+type Command struct {
+	// Short description of the command
+	Description string
+	// Command line usage
+	Usage string
+	// Flag set of the command
+	flagSet *flag.FlagSet
+	// Execute the command
+	RunMethod func(repository.Repo, []string) error
+}
+
+// Run executes a command, given its arguments.
+//
+// The args parameter is all of the command line args that followed the
+// subcommand.
+func (cmd *Command) Run(repo repository.Repo, args []string) error {
+	return cmd.RunMethod(repo, args)
+}
+
+func (cmd *Command) PrintUsage(rootCommand string, cmdName string) {
+	fmt.Printf("Usage: %s %s %s\n", rootCommand, cmdName, cmd.Usage)
+
+	if cmd.flagSet != nil {
+		fmt.Printf("\nOptions:\n")
+		cmd.flagSet.PrintDefaults()
+	}
+}
+
+// CommandMap defines all of the available (sub)commands.
+var CommandMap map[string]*Command
+
+// We use init() to avoid a cycle in the data initialization because of the "commands" command
+func init() {
+	CommandMap = map[string]*Command{
+		"commands": commandsCmd,
+		"comment":  commentCmd,
+		"ls":       lsCmd,
+		"new":      newCmd,
+		"pull":     pullCmd,
+		"push":     pushCmd,
+	}
+}
diff --git a/commands/commands.go b/commands/commands.go
index faca02ab5a55d3ef6e0ee22f924064acacdeaf4a..0a3c33ad968bc60d08bb0922a54c1deae5310372 100644
--- a/commands/commands.go
+++ b/commands/commands.go
@@ -1,31 +1,44 @@
-// Package commands contains the assorted sub commands supported by the git-bug tool.
 package commands
 
 import (
+	"flag"
+	"fmt"
 	"github.com/MichaelMure/git-bug/repository"
 )
 
-const messageFilename = "BUG_MESSAGE_EDITMSG"
+var commandsFlagSet = flag.NewFlagSet("commands", flag.ExitOnError)
 
-// Command represents the definition of a single command.
-type Command struct {
-	Usage     func(string)
-	RunMethod func(repository.Repo, []string) error
-}
+var (
+	commandsDesc = commandsFlagSet.Bool("pretty", false, "Output the command description as well as Markdown compatible comment")
+)
+
+func runCommands(repo repository.Repo, args []string) error {
+	commandsFlagSet.Parse(args)
+	args = commandsFlagSet.Args()
+
+	first := true
+
+	for name, cmd := range CommandMap {
+		if !first {
+			fmt.Println()
+		}
+
+		first = false
+
+		if *commandsDesc {
+			fmt.Printf("# %s\n", cmd.Description)
+		}
+
+		// TODO: the root name command ("git bug") should be passed from git-bug.go but well ...
+		fmt.Printf("%s %s %s\n", "git bug", name, cmd.Usage)
+	}
 
-// Run executes a command, given its arguments.
-//
-// The args parameter is all of the command line args that followed the
-// subcommand.
-func (cmd *Command) Run(repo repository.Repo, args []string) error {
-	return cmd.RunMethod(repo, args)
+	return nil
 }
 
-// CommandMap defines all of the available (sub)commands.
-var CommandMap = map[string]*Command{
-	"comment": commentCmd,
-	"ls":      lsCmd,
-	"new":     newCmd,
-	"pull":    pullCmd,
-	"push":    pushCmd,
+var commandsCmd = &Command{
+	Description: "Display available commands",
+	Usage:       "[<option>...]",
+	flagSet:     commandsFlagSet,
+	RunMethod:   runCommands,
 }
diff --git a/commands/comment.go b/commands/comment.go
index 27908793f205b84a5ecb5fb80339c4ad5974ef5d..f635139b045b1885a3ee440d00dbbcf653c87aa7 100644
--- a/commands/comment.go
+++ b/commands/comment.go
@@ -3,7 +3,6 @@ package commands
 import (
 	"errors"
 	"flag"
-	"fmt"
 	"github.com/MichaelMure/git-bug/bug"
 	"github.com/MichaelMure/git-bug/bug/operations"
 	"github.com/MichaelMure/git-bug/commands/input"
@@ -50,24 +49,23 @@ func runComment(repo repository.Repo, args []string) error {
 		return err
 	}
 
-	bug, err := bug.FindBug(repo, prefix)
+	b, err := bug.FindBug(repo, prefix)
 	if err != nil {
 		return err
 	}
 
 	addCommentOp := operations.NewAddCommentOp(author, *commentMessage)
 
-	bug.Append(addCommentOp)
+	b.Append(addCommentOp)
 
-	err = bug.Commit(repo)
+	err = b.Commit(repo)
 
 	return err
 }
 
 var commentCmd = &Command{
-	Usage: func(arg0 string) {
-		fmt.Printf("Usage: %s comment <id> [<option>...]\n\nOptions:\n", arg0)
-		commentFlagSet.PrintDefaults()
-	},
-	RunMethod: runComment,
+	Description: "Add a new comment to a bug",
+	Usage:       "[<options>...] <id>",
+	flagSet:     commentFlagSet,
+	RunMethod:   runComment,
 }
diff --git a/commands/ls.go b/commands/ls.go
index 1e001ddbae40b19d4c45e24b2425cdf39983f9c4..dea2bba25f73c67878078023d180ab80039aff52 100644
--- a/commands/ls.go
+++ b/commands/ls.go
@@ -29,8 +29,7 @@ func runLsBug(repo repository.Repo, args []string) error {
 }
 
 var lsCmd = &Command{
-	Usage: func(arg0 string) {
-		fmt.Printf("Usage: %s ls\n", arg0)
-	},
-	RunMethod: runLsBug,
+	Description: "Display a summary of all bugs",
+	Usage:       "",
+	RunMethod:   runLsBug,
 }
diff --git a/commands/new.go b/commands/new.go
index 2db9529131550544de06caf267d85da510e64ddb..a2373515000ec5305b7bf0be2b583a5697c8072f 100644
--- a/commands/new.go
+++ b/commands/new.go
@@ -3,7 +3,6 @@ package commands
 import (
 	"errors"
 	"flag"
-	"fmt"
 	"github.com/MichaelMure/git-bug/bug"
 	"github.com/MichaelMure/git-bug/bug/operations"
 	"github.com/MichaelMure/git-bug/commands/input"
@@ -66,9 +65,8 @@ func runNewBug(repo repository.Repo, args []string) error {
 }
 
 var newCmd = &Command{
-	Usage: func(arg0 string) {
-		fmt.Printf("Usage: %s new <title> [<option>...]\n\nOptions:\n", arg0)
-		newFlagSet.PrintDefaults()
-	},
-	RunMethod: runNewBug,
+	Description: "Create a new bug",
+	Usage:       "[<option>...] <title>",
+	flagSet:     newFlagSet,
+	RunMethod:   runNewBug,
 }
diff --git a/commands/pull.go b/commands/pull.go
index b408c285b8b699498c4383b6a1119df8311e0bec..dbff4fb1a1cb41e9637e276836c49e64de18f2ec 100644
--- a/commands/pull.go
+++ b/commands/pull.go
@@ -25,8 +25,7 @@ func runPull(repo repository.Repo, args []string) error {
 
 // showCmd defines the "push" subcommand.
 var pullCmd = &Command{
-	Usage: func(arg0 string) {
-		fmt.Printf("Usage: %s pull [<remote>]\n", arg0)
-	},
-	RunMethod: runPull,
+	Description: "Pull bugs update from a git remote",
+	Usage:       "[<remote>]",
+	RunMethod:   runPull,
 }
diff --git a/commands/push.go b/commands/push.go
index 416a61a19a96f3015078767d93b989c86164e87c..acc3564a1212351bd6850bf29bb412b2a6068529 100644
--- a/commands/push.go
+++ b/commands/push.go
@@ -25,8 +25,7 @@ func runPush(repo repository.Repo, args []string) error {
 
 // showCmd defines the "push" subcommand.
 var pushCmd = &Command{
-	Usage: func(arg0 string) {
-		fmt.Printf("Usage: %s push [<remote>]\n", arg0)
-	},
-	RunMethod: runPush,
+	Description: "Push bugs update to a git remote",
+	Usage:       "[<remote>]",
+	RunMethod:   runPush,
 }