From ae5c0967cec40a7dcf9804ff592a4d15f1b26569 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Mur=C3=A9?= <batolettre@gmail.com>
Date: Tue, 28 Jul 2020 20:24:24 +0200
Subject: [PATCH] commands: cleanup the command's usage to avoid warnings when
 generating the doc

---
 commands/bridge_auth_addtoken.go        |  2 +-
 commands/bridge_auth_rm.go              |  2 +-
 commands/bridge_pull.go                 |  2 +-
 commands/bridge_push.go                 |  2 +-
 commands/bridge_rm.go                   |  2 +-
 commands/commands.go                    |  2 +-
 commands/comment.go                     |  4 ++--
 commands/comment_add.go                 |  4 ++--
 commands/label.go                       |  4 ++--
 commands/label_add.go                   |  8 ++++---
 commands/label_rm.go                    |  8 ++++---
 commands/ls-id.go                       |  2 +-
 commands/ls.go                          |  2 +-
 commands/pull.go                        |  2 +-
 commands/push.go                        |  2 +-
 commands/rm.go                          |  2 +-
 commands/select.go                      |  6 +++---
 commands/show.go                        | 12 +++++------
 commands/status.go                      |  5 ++---
 commands/status_close.go                |  5 ++---
 commands/status_open.go                 |  5 ++---
 commands/title.go                       |  5 ++---
 commands/title_edit.go                  |  4 ++--
 commands/user.go                        | 12 +++++------
 commands/user_adopt.go                  |  2 +-
 doc/man/git-bug-bridge-auth-add-token.1 |  2 +-
 doc/man/git-bug-bridge-auth-rm.1        |  2 +-
 doc/man/git-bug-bridge-pull.1           |  2 +-
 doc/man/git-bug-bridge-push.1           |  2 +-
 doc/man/git-bug-bridge-rm.1             |  2 +-
 doc/man/git-bug-commands.1              |  2 +-
 doc/man/git-bug-comment-add.1           |  2 +-
 doc/man/git-bug-comment.1               |  2 +-
 doc/man/git-bug-label-add.1             |  2 +-
 doc/man/git-bug-label-rm.1              |  2 +-
 doc/man/git-bug-label.1                 |  2 +-
 doc/man/git-bug-ls-id.1                 |  2 +-
 doc/man/git-bug-ls.1                    |  2 +-
 doc/man/git-bug-pull.1                  |  2 +-
 doc/man/git-bug-push.1                  |  2 +-
 doc/man/git-bug-rm.1                    | 28 +++++++++++++++++++++++++
 doc/man/git-bug-select.1                |  4 ++--
 doc/man/git-bug-show.1                  |  2 +-
 doc/man/git-bug-status-close.1          |  2 +-
 doc/man/git-bug-status-open.1           |  2 +-
 doc/man/git-bug-status.1                |  2 +-
 doc/man/git-bug-title-edit.1            |  2 +-
 doc/man/git-bug-title.1                 |  2 +-
 doc/man/git-bug-user-adopt.1            |  2 +-
 doc/man/git-bug-user.1                  |  2 +-
 doc/man/git-bug.1                       |  2 +-
 doc/md/git-bug.md                       |  1 +
 doc/md/git-bug_bridge_auth_add-token.md |  2 +-
 doc/md/git-bug_bridge_auth_rm.md        |  2 +-
 doc/md/git-bug_bridge_pull.md           |  2 +-
 doc/md/git-bug_bridge_push.md           |  2 +-
 doc/md/git-bug_bridge_rm.md             |  2 +-
 doc/md/git-bug_commands.md              |  2 +-
 doc/md/git-bug_comment.md               |  2 +-
 doc/md/git-bug_comment_add.md           |  2 +-
 doc/md/git-bug_label.md                 |  2 +-
 doc/md/git-bug_label_add.md             |  2 +-
 doc/md/git-bug_label_rm.md              |  2 +-
 doc/md/git-bug_ls-id.md                 |  2 +-
 doc/md/git-bug_ls.md                    |  2 +-
 doc/md/git-bug_pull.md                  |  2 +-
 doc/md/git-bug_push.md                  |  2 +-
 doc/md/git-bug_rm.md                    | 22 +++++++++++++++++++
 doc/md/git-bug_select.md                |  4 ++--
 doc/md/git-bug_show.md                  |  2 +-
 doc/md/git-bug_status.md                |  2 +-
 doc/md/git-bug_status_close.md          |  2 +-
 doc/md/git-bug_status_open.md           |  2 +-
 doc/md/git-bug_title.md                 |  2 +-
 doc/md/git-bug_title_edit.md            |  2 +-
 doc/md/git-bug_user.md                  |  2 +-
 doc/md/git-bug_user_adopt.md            |  2 +-
 misc/bash_completion/git-bug            | 21 +++++++++++++++++++
 misc/gen_completion.go                  | 26 +++++++++++++----------
 misc/powershell_completion/git-bug      |  4 ++++
 misc/zsh_completion/git-bug             |  8 +++++++
 81 files changed, 203 insertions(+), 115 deletions(-)
 create mode 100644 doc/man/git-bug-rm.1
 create mode 100644 doc/md/git-bug_rm.md

diff --git a/commands/bridge_auth_addtoken.go b/commands/bridge_auth_addtoken.go
index 55edd919b0243c3e86e41119335cbc98723b03b7..272eab8cf78b7f81735d7940ea93c0a04d207c5d 100644
--- a/commands/bridge_auth_addtoken.go
+++ b/commands/bridge_auth_addtoken.go
@@ -27,7 +27,7 @@ func newBridgeAuthAddTokenCommand() *cobra.Command {
 	options := bridgeAuthAddTokenOptions{}
 
 	cmd := &cobra.Command{
-		Use:      "add-token [<token>]",
+		Use:      "add-token [TOKEN]",
 		Short:    "Store a new token",
 		PreRunE:  loadBackendEnsureUser(env),
 		PostRunE: closeBackend(env),
diff --git a/commands/bridge_auth_rm.go b/commands/bridge_auth_rm.go
index b2a44e92d063a92a4da6b1e918cf0d6db7c733b3..fa73ad1152926b31927da4d241d607d8ab6db957 100644
--- a/commands/bridge_auth_rm.go
+++ b/commands/bridge_auth_rm.go
@@ -10,7 +10,7 @@ func newBridgeAuthRm() *cobra.Command {
 	env := newEnv()
 
 	cmd := &cobra.Command{
-		Use:     "rm <id>",
+		Use:     "rm ID",
 		Short:   "Remove a credential.",
 		PreRunE: loadRepo(env),
 		RunE: func(cmd *cobra.Command, args []string) error {
diff --git a/commands/bridge_pull.go b/commands/bridge_pull.go
index bb7055824aae77af0d382fa2a7cf6b7ea646eb95..95eb2fe04b1373b1ce39179d3be90a32dcd32c2b 100644
--- a/commands/bridge_pull.go
+++ b/commands/bridge_pull.go
@@ -26,7 +26,7 @@ func newBridgePullCommand() *cobra.Command {
 	options := bridgePullOptions{}
 
 	cmd := &cobra.Command{
-		Use:      "pull [<name>]",
+		Use:      "pull [NAME]",
 		Short:    "Pull updates.",
 		PreRunE:  loadBackend(env),
 		PostRunE: closeBackend(env),
diff --git a/commands/bridge_push.go b/commands/bridge_push.go
index 7061a5ca2c91db389a99f526ffa90cb8e2fb03dd..64e3ff4bcfd8db7fe9c81ef42cff3206a598cb59 100644
--- a/commands/bridge_push.go
+++ b/commands/bridge_push.go
@@ -17,7 +17,7 @@ func newBridgePushCommand() *cobra.Command {
 	env := newEnv()
 
 	cmd := &cobra.Command{
-		Use:      "push [<name>]",
+		Use:      "push [NAME]",
 		Short:    "Push updates.",
 		PreRunE:  loadBackendEnsureUser(env),
 		PostRunE: closeBackend(env),
diff --git a/commands/bridge_rm.go b/commands/bridge_rm.go
index 9f93c37a0aece5cf20e8ab83c33b2c2dcbc111ab..9f5c81c7c48e31225ef833ff01c17fa85f4cd8b4 100644
--- a/commands/bridge_rm.go
+++ b/commands/bridge_rm.go
@@ -10,7 +10,7 @@ func newBridgeRm() *cobra.Command {
 	env := newEnv()
 
 	cmd := &cobra.Command{
-		Use:      "rm <name>",
+		Use:      "rm NAME",
 		Short:    "Delete a configured bridge.",
 		PreRunE:  loadBackend(env),
 		PostRunE: closeBackend(env),
diff --git a/commands/commands.go b/commands/commands.go
index 103d5412b8aa515ae098daa04f59f6637320c756..49c960abb4da73f4823aa246ad11cfd3d849a62d 100644
--- a/commands/commands.go
+++ b/commands/commands.go
@@ -15,7 +15,7 @@ func newCommandsCommand() *cobra.Command {
 	options := commandOptions{}
 
 	cmd := &cobra.Command{
-		Use:   "commands [<option>...]",
+		Use:   "commands",
 		Short: "Display available commands.",
 		RunE: func(cmd *cobra.Command, args []string) error {
 			return runCommands(env, options)
diff --git a/commands/comment.go b/commands/comment.go
index e81405a64be980bd114aa3db7841a132ce50b9b9..d8995c3ed1e59aed1a503c9358870ad1b93d7276 100644
--- a/commands/comment.go
+++ b/commands/comment.go
@@ -4,7 +4,7 @@ import (
 	text "github.com/MichaelMure/go-term-text"
 	"github.com/spf13/cobra"
 
-	"github.com/MichaelMure/git-bug/commands/select"
+	_select "github.com/MichaelMure/git-bug/commands/select"
 	"github.com/MichaelMure/git-bug/util/colors"
 )
 
@@ -12,7 +12,7 @@ func newCommentCommand() *cobra.Command {
 	env := newEnv()
 
 	cmd := &cobra.Command{
-		Use:      "comment [<id>]",
+		Use:      "comment [ID]",
 		Short:    "Display or add comments to a bug.",
 		PreRunE:  loadBackend(env),
 		PostRunE: closeBackend(env),
diff --git a/commands/comment_add.go b/commands/comment_add.go
index 47366d003ffcd702c4dcbb51ef899d1b09095ec7..6caf494367770afe88f43f3025cf89e0d1b27e60 100644
--- a/commands/comment_add.go
+++ b/commands/comment_add.go
@@ -3,7 +3,7 @@ package commands
 import (
 	"github.com/spf13/cobra"
 
-	"github.com/MichaelMure/git-bug/commands/select"
+	_select "github.com/MichaelMure/git-bug/commands/select"
 	"github.com/MichaelMure/git-bug/input"
 )
 
@@ -17,7 +17,7 @@ func newCommentAddCommand() *cobra.Command {
 	options := commentAddOptions{}
 
 	cmd := &cobra.Command{
-		Use:      "add [<id>]",
+		Use:      "add [ID]",
 		Short:    "Add a new comment to a bug.",
 		PreRunE:  loadBackendEnsureUser(env),
 		PostRunE: closeBackend(env),
diff --git a/commands/label.go b/commands/label.go
index de7bdb3ac4961e6f0ca44899953d3bcf345d3e4f..e3ffdb64466c61cb4bce4292d4fe61eb53dd46ea 100644
--- a/commands/label.go
+++ b/commands/label.go
@@ -3,14 +3,14 @@ package commands
 import (
 	"github.com/spf13/cobra"
 
-	"github.com/MichaelMure/git-bug/commands/select"
+	_select "github.com/MichaelMure/git-bug/commands/select"
 )
 
 func newLabelCommand() *cobra.Command {
 	env := newEnv()
 
 	cmd := &cobra.Command{
-		Use:      "label [<id>]",
+		Use:      "label [ID]",
 		Short:    "Display, add or remove labels to/from a bug.",
 		PreRunE:  loadBackend(env),
 		PostRunE: closeBackend(env),
diff --git a/commands/label_add.go b/commands/label_add.go
index 05a27948441cf50c9c5d33af0cef6251869c0763..ce971f043007a692f79520393e20ac728368aad2 100644
--- a/commands/label_add.go
+++ b/commands/label_add.go
@@ -3,14 +3,14 @@ package commands
 import (
 	"github.com/spf13/cobra"
 
-	"github.com/MichaelMure/git-bug/commands/select"
+	_select "github.com/MichaelMure/git-bug/commands/select"
 )
 
 func newLabelAddCommand() *cobra.Command {
 	env := newEnv()
 
 	cmd := &cobra.Command{
-		Use:      "add [<id>] <label>[...]",
+		Use:      "add [ID] LABEL...",
 		Short:    "Add a label to a bug.",
 		PreRunE:  loadBackendEnsureUser(env),
 		PostRunE: closeBackend(env),
@@ -28,7 +28,9 @@ func runLabelAdd(env *Env, args []string) error {
 		return err
 	}
 
-	changes, _, err := b.ChangeLabels(args, nil)
+	added := args
+
+	changes, _, err := b.ChangeLabels(added, nil)
 
 	for _, change := range changes {
 		env.out.Println(change)
diff --git a/commands/label_rm.go b/commands/label_rm.go
index 445a56a42b9cd410f3a1d46f4c7f93079c56b925..f59ec02d8d14d52fddb6a7e8c88de1ceea84a224 100644
--- a/commands/label_rm.go
+++ b/commands/label_rm.go
@@ -3,14 +3,14 @@ package commands
 import (
 	"github.com/spf13/cobra"
 
-	"github.com/MichaelMure/git-bug/commands/select"
+	_select "github.com/MichaelMure/git-bug/commands/select"
 )
 
 func newLabelRmCommand() *cobra.Command {
 	env := newEnv()
 
 	cmd := &cobra.Command{
-		Use:      "rm [<id>] <label>[...]",
+		Use:      "rm [ID] LABEL...",
 		Short:    "Remove a label from a bug.",
 		PreRunE:  loadBackend(env),
 		PostRunE: closeBackend(env),
@@ -28,7 +28,9 @@ func runLabelRm(env *Env, args []string) error {
 		return err
 	}
 
-	changes, _, err := b.ChangeLabels(nil, args)
+	removed := args
+
+	changes, _, err := b.ChangeLabels(nil, removed)
 
 	for _, change := range changes {
 		env.out.Println(change)
diff --git a/commands/ls-id.go b/commands/ls-id.go
index bed6c05790d9441a22d45c3fb94bd317f40f5569..686f432aff2a26e570bd6269f5ddfe47a4846739 100644
--- a/commands/ls-id.go
+++ b/commands/ls-id.go
@@ -8,7 +8,7 @@ func newLsIdCommand() *cobra.Command {
 	env := newEnv()
 
 	cmd := &cobra.Command{
-		Use:      "ls-id [<prefix>]",
+		Use:      "ls-id [PREFIX]",
 		Short:    "List bug identifiers.",
 		PreRunE:  loadBackend(env),
 		PostRunE: closeBackend(env),
diff --git a/commands/ls.go b/commands/ls.go
index 4431e0d43563beae3526d99b7a60653cacbe2f4d..9a863638c8bcfaad46609a4a566a6aa672e8ff9c 100644
--- a/commands/ls.go
+++ b/commands/ls.go
@@ -31,7 +31,7 @@ func newLsCommand() *cobra.Command {
 	options := lsOptions{}
 
 	cmd := &cobra.Command{
-		Use:   "ls [<query>]",
+		Use:   "ls [QUERY]",
 		Short: "List bugs.",
 		Long: `Display a summary of each bugs.
 
diff --git a/commands/pull.go b/commands/pull.go
index 3f032593525b683d745471310c370d736eac9ee4..3ad4a0c91c67496acee05bd2e3a9d200121b7a9d 100644
--- a/commands/pull.go
+++ b/commands/pull.go
@@ -12,7 +12,7 @@ func newPullCommand() *cobra.Command {
 	env := newEnv()
 
 	cmd := &cobra.Command{
-		Use:      "pull [<remote>]",
+		Use:      "pull [REMOTE]",
 		Short:    "Pull bugs update from a git remote.",
 		PreRunE:  loadBackend(env),
 		PostRunE: closeBackend(env),
diff --git a/commands/push.go b/commands/push.go
index f4b83fab500c3846fab905e2f09a7e2cf8f0bbf8..89385f108287ab7ca5d5cc99f5cc35036a95433b 100644
--- a/commands/push.go
+++ b/commands/push.go
@@ -10,7 +10,7 @@ func newPushCommand() *cobra.Command {
 	env := newEnv()
 
 	cmd := &cobra.Command{
-		Use:      "push [<remote>]",
+		Use:      "push [REMOTE]",
 		Short:    "Push bugs update to a git remote.",
 		PreRunE:  loadBackend(env),
 		PostRunE: closeBackend(env),
diff --git a/commands/rm.go b/commands/rm.go
index 09f6a6ccf7b5b4379b1b146fc137f4fd1b1df28b..3ad4548de15a83f88cd565edda80a93effe089c7 100644
--- a/commands/rm.go
+++ b/commands/rm.go
@@ -10,7 +10,7 @@ func newRmCommand() *cobra.Command {
 	env := newEnv()
 
 	cmd := &cobra.Command{
-		Use:      "rm <id>",
+		Use:      "rm ID",
 		Short:    "Remove an existing bug.",
 		Long:     "Remove an existing bug in the local repository. Note removing bugs that were imported from bridges will not remove the bug on the remote, and will only remove the local copy of the bug.",
 		PreRunE:  loadBackendEnsureUser(env),
diff --git a/commands/select.go b/commands/select.go
index f2cf2d47557d44cd8b5a202cc031b305ec75ce24..64e38d9bd02785626b8466d3e6c19d3fad472611 100644
--- a/commands/select.go
+++ b/commands/select.go
@@ -5,14 +5,14 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/MichaelMure/git-bug/commands/select"
+	_select "github.com/MichaelMure/git-bug/commands/select"
 )
 
 func newSelectCommand() *cobra.Command {
 	env := newEnv()
 
 	cmd := &cobra.Command{
-		Use:   "select <id>",
+		Use:   "select ID",
 		Short: "Select a bug for implicit use in future commands.",
 		Example: `git bug select 2f15
 git bug comment
@@ -20,7 +20,7 @@ git bug status
 `,
 		Long: `Select a bug for implicit use in future commands.
 
-This command allows you to omit any bug <id> argument, for example:
+This command allows you to omit any bug ID argument, for example:
   git bug show
 instead of
   git bug show 2f153ca
diff --git a/commands/show.go b/commands/show.go
index f39952050ba16236c13088208d0001174c42a752..77f315cc4a691cce1740c16a46fa122cb50ec066 100644
--- a/commands/show.go
+++ b/commands/show.go
@@ -14,7 +14,7 @@ import (
 )
 
 type showOptions struct {
-	query  string
+	fields string
 	format string
 }
 
@@ -23,7 +23,7 @@ func newShowCommand() *cobra.Command {
 	options := showOptions{}
 
 	cmd := &cobra.Command{
-		Use:      "show [<id>]",
+		Use:      "show [ID]",
 		Short:    "Display the details of a bug.",
 		PreRunE:  loadBackend(env),
 		PostRunE: closeBackend(env),
@@ -35,7 +35,7 @@ func newShowCommand() *cobra.Command {
 	flags := cmd.Flags()
 	flags.SortFlags = false
 
-	flags.StringVarP(&options.query, "field", "", "",
+	flags.StringVarP(&options.fields, "field", "", "",
 		"Select field to display. Valid values are [author,authorEmail,createTime,lastEdit,humanId,id,labels,shortId,status,title,actors,participants]")
 	flags.StringVarP(&options.format, "format", "f", "default",
 		"Select the output formatting style. Valid values are [default,json,org-mode]")
@@ -55,8 +55,8 @@ func runShow(env *Env, opts showOptions, args []string) error {
 		return errors.New("invalid bug: no comment")
 	}
 
-	if opts.query != "" {
-		switch opts.query {
+	if opts.fields != "" {
+		switch opts.fields {
 		case "author":
 			env.out.Printf("%s\n", snap.Author.DisplayName())
 		case "authorEmail":
@@ -88,7 +88,7 @@ func runShow(env *Env, opts showOptions, args []string) error {
 		case "title":
 			env.out.Printf("%s\n", snap.Title)
 		default:
-			return fmt.Errorf("\nUnsupported field: %s\n", opts.query)
+			return fmt.Errorf("\nUnsupported field: %s\n", opts.fields)
 		}
 
 		return nil
diff --git a/commands/status.go b/commands/status.go
index 57771bcac1283c6674524cbc19c01136d1f85370..4dceb51c3773e84452c159831b255dc9f62ca24e 100644
--- a/commands/status.go
+++ b/commands/status.go
@@ -1,16 +1,15 @@
 package commands
 
 import (
+	_select "github.com/MichaelMure/git-bug/commands/select"
 	"github.com/spf13/cobra"
-
-	"github.com/MichaelMure/git-bug/commands/select"
 )
 
 func newStatusCommand() *cobra.Command {
 	env := newEnv()
 
 	cmd := &cobra.Command{
-		Use:      "status [<id>]",
+		Use:      "status [ID]",
 		Short:    "Display or change a bug status.",
 		PreRunE:  loadBackend(env),
 		PostRunE: closeBackend(env),
diff --git a/commands/status_close.go b/commands/status_close.go
index 29092a7b83ff30fb66d3d1537553767ac87029a5..76f2a758a257cf824ca50b3f265b6ab36595d7e4 100644
--- a/commands/status_close.go
+++ b/commands/status_close.go
@@ -1,16 +1,15 @@
 package commands
 
 import (
+	_select "github.com/MichaelMure/git-bug/commands/select"
 	"github.com/spf13/cobra"
-
-	"github.com/MichaelMure/git-bug/commands/select"
 )
 
 func newStatusCloseCommand() *cobra.Command {
 	env := newEnv()
 
 	cmd := &cobra.Command{
-		Use:      "close [<id>]",
+		Use:      "close [ID]",
 		Short:    "Mark a bug as closed.",
 		PreRunE:  loadBackendEnsureUser(env),
 		PostRunE: closeBackend(env),
diff --git a/commands/status_open.go b/commands/status_open.go
index 9dd9082c66aadb4b76e639dd4ff0c2093e9ae044..ff77856106903f03674c9f84b9a51d3dd0a45e6c 100644
--- a/commands/status_open.go
+++ b/commands/status_open.go
@@ -1,16 +1,15 @@
 package commands
 
 import (
+	_select "github.com/MichaelMure/git-bug/commands/select"
 	"github.com/spf13/cobra"
-
-	"github.com/MichaelMure/git-bug/commands/select"
 )
 
 func newStatusOpenCommand() *cobra.Command {
 	env := newEnv()
 
 	cmd := &cobra.Command{
-		Use:      "open [<id>]",
+		Use:      "open [ID]",
 		Short:    "Mark a bug as open.",
 		PreRunE:  loadBackendEnsureUser(env),
 		PostRunE: closeBackend(env),
diff --git a/commands/title.go b/commands/title.go
index d11fb40eabfb46e3b864d22e1b001daa099714e6..7afa07ce711b7d4905036c7c861fd24dc99959d2 100644
--- a/commands/title.go
+++ b/commands/title.go
@@ -1,16 +1,15 @@
 package commands
 
 import (
+	_select "github.com/MichaelMure/git-bug/commands/select"
 	"github.com/spf13/cobra"
-
-	"github.com/MichaelMure/git-bug/commands/select"
 )
 
 func newTitleCommand() *cobra.Command {
 	env := newEnv()
 
 	cmd := &cobra.Command{
-		Use:      "title [<id>]",
+		Use:      "title [ID]",
 		Short:    "Display or change a title of a bug.",
 		PreRunE:  loadBackend(env),
 		PostRunE: closeBackend(env),
diff --git a/commands/title_edit.go b/commands/title_edit.go
index e2dbc24573d135e20cd033b26ee87850f4d0cfd7..3750f2cc081cf7344e36095242aaf37d5e9ec675 100644
--- a/commands/title_edit.go
+++ b/commands/title_edit.go
@@ -3,7 +3,7 @@ package commands
 import (
 	"github.com/spf13/cobra"
 
-	"github.com/MichaelMure/git-bug/commands/select"
+	_select "github.com/MichaelMure/git-bug/commands/select"
 	"github.com/MichaelMure/git-bug/input"
 )
 
@@ -16,7 +16,7 @@ func newTitleEditCommand() *cobra.Command {
 	options := titleEditOptions{}
 
 	cmd := &cobra.Command{
-		Use:      "edit [<id>]",
+		Use:      "edit [ID]",
 		Short:    "Edit a title of a bug.",
 		PreRunE:  loadBackendEnsureUser(env),
 		PostRunE: closeBackend(env),
diff --git a/commands/user.go b/commands/user.go
index 8a6aef538a54f3b55533ce4a5cb2975b1c750b13..d4d3fecdb04695bc26f7103db68d8a17df50c94b 100644
--- a/commands/user.go
+++ b/commands/user.go
@@ -10,7 +10,7 @@ import (
 )
 
 type userOptions struct {
-	fieldsQuery string
+	fields string
 }
 
 func newUserCommand() *cobra.Command {
@@ -18,7 +18,7 @@ func newUserCommand() *cobra.Command {
 	options := userOptions{}
 
 	cmd := &cobra.Command{
-		Use:      "user [<user-id>]",
+		Use:      "user [USER-ID]",
 		Short:    "Display or change the user identity.",
 		PreRunE:  loadBackendEnsureUser(env),
 		PostRunE: closeBackend(env),
@@ -34,7 +34,7 @@ func newUserCommand() *cobra.Command {
 	flags := cmd.Flags()
 	flags.SortFlags = false
 
-	flags.StringVarP(&options.fieldsQuery, "field", "f", "",
+	flags.StringVarP(&options.fields, "field", "f", "",
 		"Select field to display. Valid values are [email,humanId,id,lastModification,lastModificationLamport,login,metadata,name]")
 
 	return cmd
@@ -57,8 +57,8 @@ func runUser(env *Env, opts userOptions, args []string) error {
 		return err
 	}
 
-	if opts.fieldsQuery != "" {
-		switch opts.fieldsQuery {
+	if opts.fields != "" {
+		switch opts.fields {
 		case "email":
 			env.out.Printf("%s\n", id.Email())
 		case "login":
@@ -80,7 +80,7 @@ func runUser(env *Env, opts userOptions, args []string) error {
 			env.out.Printf("%s\n", id.Name())
 
 		default:
-			return fmt.Errorf("\nUnsupported field: %s\n", opts.fieldsQuery)
+			return fmt.Errorf("\nUnsupported field: %s\n", opts.fields)
 		}
 
 		return nil
diff --git a/commands/user_adopt.go b/commands/user_adopt.go
index 521f032ff5a9384f501f4cce4769f38af399acba..5ab6e39c0de33ebdb858827b91034258210644e9 100644
--- a/commands/user_adopt.go
+++ b/commands/user_adopt.go
@@ -8,7 +8,7 @@ func newUserAdoptCommand() *cobra.Command {
 	env := newEnv()
 
 	cmd := &cobra.Command{
-		Use:      "adopt <user-id>",
+		Use:      "adopt USER-ID",
 		Short:    "Adopt an existing identity as your own.",
 		Args:     cobra.ExactArgs(1),
 		PreRunE:  loadBackend(env),
diff --git a/doc/man/git-bug-bridge-auth-add-token.1 b/doc/man/git-bug-bridge-auth-add-token.1
index fe4750b4fda75ddc3cd70d5a5c8ab80a42bb1862..d522f0c72174920483b8e40b9db4b47c5c93c48a 100644
--- a/doc/man/git-bug-bridge-auth-add-token.1
+++ b/doc/man/git-bug-bridge-auth-add-token.1
@@ -9,7 +9,7 @@ git\-bug\-bridge\-auth\-add\-token \- Store a new token
 
 .SH SYNOPSIS
 .PP
-\fBgit\-bug bridge auth add\-token [] [flags]\fP
+\fBgit\-bug bridge auth add\-token [TOKEN] [flags]\fP
 
 
 .SH DESCRIPTION
diff --git a/doc/man/git-bug-bridge-auth-rm.1 b/doc/man/git-bug-bridge-auth-rm.1
index 9ddac3f2ea3e67d9e4dbea6bf544ef46ef46ed13..f2a9408a2c1acff32f16ca26c92809e8f51a2f0f 100644
--- a/doc/man/git-bug-bridge-auth-rm.1
+++ b/doc/man/git-bug-bridge-auth-rm.1
@@ -9,7 +9,7 @@ git\-bug\-bridge\-auth\-rm \- Remove a credential.
 
 .SH SYNOPSIS
 .PP
-\fBgit\-bug bridge auth rm  [flags]\fP
+\fBgit\-bug bridge auth rm ID [flags]\fP
 
 
 .SH DESCRIPTION
diff --git a/doc/man/git-bug-bridge-pull.1 b/doc/man/git-bug-bridge-pull.1
index 4a9e78dbef4f107ba88a11458706c1bbb870dc2a..12d12438c6395ef4d0820972e2c9a743e78a9e81 100644
--- a/doc/man/git-bug-bridge-pull.1
+++ b/doc/man/git-bug-bridge-pull.1
@@ -9,7 +9,7 @@ git\-bug\-bridge\-pull \- Pull updates.
 
 .SH SYNOPSIS
 .PP
-\fBgit\-bug bridge pull [] [flags]\fP
+\fBgit\-bug bridge pull [NAME] [flags]\fP
 
 
 .SH DESCRIPTION
diff --git a/doc/man/git-bug-bridge-push.1 b/doc/man/git-bug-bridge-push.1
index 59e60bdf1aef23eefc6cb8d3b80c528ac7fe35ea..c15cce60140a9ab279556d9f5afdd0f79ceaac7e 100644
--- a/doc/man/git-bug-bridge-push.1
+++ b/doc/man/git-bug-bridge-push.1
@@ -9,7 +9,7 @@ git\-bug\-bridge\-push \- Push updates.
 
 .SH SYNOPSIS
 .PP
-\fBgit\-bug bridge push [] [flags]\fP
+\fBgit\-bug bridge push [NAME] [flags]\fP
 
 
 .SH DESCRIPTION
diff --git a/doc/man/git-bug-bridge-rm.1 b/doc/man/git-bug-bridge-rm.1
index 8cfa925aa5554ef0304a638c588e8dbca7137983..70ca410f319de9fde406f95627657495341fa8a7 100644
--- a/doc/man/git-bug-bridge-rm.1
+++ b/doc/man/git-bug-bridge-rm.1
@@ -9,7 +9,7 @@ git\-bug\-bridge\-rm \- Delete a configured bridge.
 
 .SH SYNOPSIS
 .PP
-\fBgit\-bug bridge rm  [flags]\fP
+\fBgit\-bug bridge rm NAME [flags]\fP
 
 
 .SH DESCRIPTION
diff --git a/doc/man/git-bug-commands.1 b/doc/man/git-bug-commands.1
index b7c1e214a4f8e6d5e545c7bc37f0f20d5a2e4901..28fabca5037cd4d3f7bc9e645e82fcf3c6a73fb3 100644
--- a/doc/man/git-bug-commands.1
+++ b/doc/man/git-bug-commands.1
@@ -9,7 +9,7 @@ git\-bug\-commands \- Display available commands.
 
 .SH SYNOPSIS
 .PP
-\fBgit\-bug commands [\&...] [flags]\fP
+\fBgit\-bug commands [flags]\fP
 
 
 .SH DESCRIPTION
diff --git a/doc/man/git-bug-comment-add.1 b/doc/man/git-bug-comment-add.1
index 530101b8ad5880cafcf91dab0d7ba800076dcb95..c1d13aa27c5bd7656d1024004ac7419a250ab863 100644
--- a/doc/man/git-bug-comment-add.1
+++ b/doc/man/git-bug-comment-add.1
@@ -9,7 +9,7 @@ git\-bug\-comment\-add \- Add a new comment to a bug.
 
 .SH SYNOPSIS
 .PP
-\fBgit\-bug comment add [] [flags]\fP
+\fBgit\-bug comment add [ID] [flags]\fP
 
 
 .SH DESCRIPTION
diff --git a/doc/man/git-bug-comment.1 b/doc/man/git-bug-comment.1
index 9beb7a065d794dafb63f19d14fe3e2f73bec757c..7d46258da08694add55f29bb400a6ecb7a99fbec 100644
--- a/doc/man/git-bug-comment.1
+++ b/doc/man/git-bug-comment.1
@@ -9,7 +9,7 @@ git\-bug\-comment \- Display or add comments to a bug.
 
 .SH SYNOPSIS
 .PP
-\fBgit\-bug comment [] [flags]\fP
+\fBgit\-bug comment [ID] [flags]\fP
 
 
 .SH DESCRIPTION
diff --git a/doc/man/git-bug-label-add.1 b/doc/man/git-bug-label-add.1
index 86a4bb24c7490c43c1ffc28587888c6403d0a016..a11cdbe71a5722812cce35f222287e1f5ffc0586 100644
--- a/doc/man/git-bug-label-add.1
+++ b/doc/man/git-bug-label-add.1
@@ -9,7 +9,7 @@ git\-bug\-label\-add \- Add a label to a bug.
 
 .SH SYNOPSIS
 .PP
-\fBgit\-bug label add [] [...] [flags]\fP
+\fBgit\-bug label add [ID] LABEL... [flags]\fP
 
 
 .SH DESCRIPTION
diff --git a/doc/man/git-bug-label-rm.1 b/doc/man/git-bug-label-rm.1
index e7e912ea5eef79435ec3c89f47d19b1e11981efc..58dcccec40321fdeca1da42017c93b85bb0ca6a3 100644
--- a/doc/man/git-bug-label-rm.1
+++ b/doc/man/git-bug-label-rm.1
@@ -9,7 +9,7 @@ git\-bug\-label\-rm \- Remove a label from a bug.
 
 .SH SYNOPSIS
 .PP
-\fBgit\-bug label rm [] [...] [flags]\fP
+\fBgit\-bug label rm [ID] LABEL... [flags]\fP
 
 
 .SH DESCRIPTION
diff --git a/doc/man/git-bug-label.1 b/doc/man/git-bug-label.1
index 23fc00470c94949f8bfb454b15339515b47ef9cc..f5a47c5c37dda8b2295d2a9b973bf02b31064ca9 100644
--- a/doc/man/git-bug-label.1
+++ b/doc/man/git-bug-label.1
@@ -9,7 +9,7 @@ git\-bug\-label \- Display, add or remove labels to/from a bug.
 
 .SH SYNOPSIS
 .PP
-\fBgit\-bug label [] [flags]\fP
+\fBgit\-bug label [ID] [flags]\fP
 
 
 .SH DESCRIPTION
diff --git a/doc/man/git-bug-ls-id.1 b/doc/man/git-bug-ls-id.1
index c7b401149644d42ae1061a6875a44b0bce092ab5..d35415b47778693f49ce50090ecead0e78ab2962 100644
--- a/doc/man/git-bug-ls-id.1
+++ b/doc/man/git-bug-ls-id.1
@@ -9,7 +9,7 @@ git\-bug\-ls\-id \- List bug identifiers.
 
 .SH SYNOPSIS
 .PP
-\fBgit\-bug ls\-id [] [flags]\fP
+\fBgit\-bug ls\-id [PREFIX] [flags]\fP
 
 
 .SH DESCRIPTION
diff --git a/doc/man/git-bug-ls.1 b/doc/man/git-bug-ls.1
index 54a64cd28859b8f8809e3f80222eee68a6a3d4d8..2e6e0b63b2b89b83c5d11633bfc601929b088a85 100644
--- a/doc/man/git-bug-ls.1
+++ b/doc/man/git-bug-ls.1
@@ -9,7 +9,7 @@ git\-bug\-ls \- List bugs.
 
 .SH SYNOPSIS
 .PP
-\fBgit\-bug ls [] [flags]\fP
+\fBgit\-bug ls [QUERY] [flags]\fP
 
 
 .SH DESCRIPTION
diff --git a/doc/man/git-bug-pull.1 b/doc/man/git-bug-pull.1
index 82b741edba5b51364bdf9d775f6dfa69597f3469..aed5a844a7cd20d6c2b574b26b378a6f4f00a949 100644
--- a/doc/man/git-bug-pull.1
+++ b/doc/man/git-bug-pull.1
@@ -9,7 +9,7 @@ git\-bug\-pull \- Pull bugs update from a git remote.
 
 .SH SYNOPSIS
 .PP
-\fBgit\-bug pull [] [flags]\fP
+\fBgit\-bug pull [REMOTE] [flags]\fP
 
 
 .SH DESCRIPTION
diff --git a/doc/man/git-bug-push.1 b/doc/man/git-bug-push.1
index dc69425843e8d887c9d84318911241f198af9149..19a90cfce06ba8d83465bcb35ac86500080f18bc 100644
--- a/doc/man/git-bug-push.1
+++ b/doc/man/git-bug-push.1
@@ -9,7 +9,7 @@ git\-bug\-push \- Push bugs update to a git remote.
 
 .SH SYNOPSIS
 .PP
-\fBgit\-bug push [] [flags]\fP
+\fBgit\-bug push [REMOTE] [flags]\fP
 
 
 .SH DESCRIPTION
diff --git a/doc/man/git-bug-rm.1 b/doc/man/git-bug-rm.1
new file mode 100644
index 0000000000000000000000000000000000000000..8989c2ff9a422efc6161b4bc8d6d533e9e7e0aac
--- /dev/null
+++ b/doc/man/git-bug-rm.1
@@ -0,0 +1,28 @@
+.nh
+.TH GIT\-BUG(1)Apr 2019
+Generated from git\-bug's source code
+
+.SH NAME
+.PP
+git\-bug\-rm \- Remove an existing bug.
+
+
+.SH SYNOPSIS
+.PP
+\fBgit\-bug rm ID [flags]\fP
+
+
+.SH DESCRIPTION
+.PP
+Remove an existing bug in the local repository. Note removing bugs that were imported from bridges will not remove the bug on the remote, and will only remove the local copy of the bug.
+
+
+.SH OPTIONS
+.PP
+\fB\-h\fP, \fB\-\-help\fP[=false]
+	help for rm
+
+
+.SH SEE ALSO
+.PP
+\fBgit\-bug(1)\fP
diff --git a/doc/man/git-bug-select.1 b/doc/man/git-bug-select.1
index 4df61221437f92300d9245f61050b80291724796..47d46fe182f7168bc9976e008c64cee5b4c0b2c2 100644
--- a/doc/man/git-bug-select.1
+++ b/doc/man/git-bug-select.1
@@ -9,7 +9,7 @@ git\-bug\-select \- Select a bug for implicit use in future commands.
 
 .SH SYNOPSIS
 .PP
-\fBgit\-bug select  [flags]\fP
+\fBgit\-bug select ID [flags]\fP
 
 
 .SH DESCRIPTION
@@ -17,7 +17,7 @@ git\-bug\-select \- Select a bug for implicit use in future commands.
 Select a bug for implicit use in future commands.
 
 .PP
-This command allows you to omit any bug  argument, for example:
+This command allows you to omit any bug ID argument, for example:
   git bug show
 instead of
   git bug show 2f153ca
diff --git a/doc/man/git-bug-show.1 b/doc/man/git-bug-show.1
index eb694dac096e589de7569bed208a3f71a9b411cc..6aca9063f0c23a00b200e7b89f3505bb7d5c0199 100644
--- a/doc/man/git-bug-show.1
+++ b/doc/man/git-bug-show.1
@@ -9,7 +9,7 @@ git\-bug\-show \- Display the details of a bug.
 
 .SH SYNOPSIS
 .PP
-\fBgit\-bug show [] [flags]\fP
+\fBgit\-bug show [ID] [flags]\fP
 
 
 .SH DESCRIPTION
diff --git a/doc/man/git-bug-status-close.1 b/doc/man/git-bug-status-close.1
index 539c5447bc23859b16d7e70c74d1ecf5167853fd..2caeb8f524693087164a3ad75b4db1b4928cd429 100644
--- a/doc/man/git-bug-status-close.1
+++ b/doc/man/git-bug-status-close.1
@@ -9,7 +9,7 @@ git\-bug\-status\-close \- Mark a bug as closed.
 
 .SH SYNOPSIS
 .PP
-\fBgit\-bug status close [] [flags]\fP
+\fBgit\-bug status close [ID] [flags]\fP
 
 
 .SH DESCRIPTION
diff --git a/doc/man/git-bug-status-open.1 b/doc/man/git-bug-status-open.1
index d7aca0d022a8d4bd672fdfc616c43a16cfe7268a..950574ff74050442eccabbc564d54e0958257338 100644
--- a/doc/man/git-bug-status-open.1
+++ b/doc/man/git-bug-status-open.1
@@ -9,7 +9,7 @@ git\-bug\-status\-open \- Mark a bug as open.
 
 .SH SYNOPSIS
 .PP
-\fBgit\-bug status open [] [flags]\fP
+\fBgit\-bug status open [ID] [flags]\fP
 
 
 .SH DESCRIPTION
diff --git a/doc/man/git-bug-status.1 b/doc/man/git-bug-status.1
index df01391159642d23d65af4e3d2621051fd9a668d..22c31a3a35b631e98da3da04907609b2ee6cdfdc 100644
--- a/doc/man/git-bug-status.1
+++ b/doc/man/git-bug-status.1
@@ -9,7 +9,7 @@ git\-bug\-status \- Display or change a bug status.
 
 .SH SYNOPSIS
 .PP
-\fBgit\-bug status [] [flags]\fP
+\fBgit\-bug status [ID] [flags]\fP
 
 
 .SH DESCRIPTION
diff --git a/doc/man/git-bug-title-edit.1 b/doc/man/git-bug-title-edit.1
index c1903854de23e5c33705f9f4ff1eb88c47b17838..99f4de86eb655ac28c1c6f35a59529d805fa063f 100644
--- a/doc/man/git-bug-title-edit.1
+++ b/doc/man/git-bug-title-edit.1
@@ -9,7 +9,7 @@ git\-bug\-title\-edit \- Edit a title of a bug.
 
 .SH SYNOPSIS
 .PP
-\fBgit\-bug title edit [] [flags]\fP
+\fBgit\-bug title edit [ID] [flags]\fP
 
 
 .SH DESCRIPTION
diff --git a/doc/man/git-bug-title.1 b/doc/man/git-bug-title.1
index e3345acdd0b03d37ac75f7c1ab0b1db6fe2f2b66..9d7deb0ed68eb71b125ccecb82ac3e2a66000b48 100644
--- a/doc/man/git-bug-title.1
+++ b/doc/man/git-bug-title.1
@@ -9,7 +9,7 @@ git\-bug\-title \- Display or change a title of a bug.
 
 .SH SYNOPSIS
 .PP
-\fBgit\-bug title [] [flags]\fP
+\fBgit\-bug title [ID] [flags]\fP
 
 
 .SH DESCRIPTION
diff --git a/doc/man/git-bug-user-adopt.1 b/doc/man/git-bug-user-adopt.1
index 2be2afcb8ca2a6e8013dc93169f37514ddc68c05..6a53b36c0ad4394751bd029287b1ed81dd472f35 100644
--- a/doc/man/git-bug-user-adopt.1
+++ b/doc/man/git-bug-user-adopt.1
@@ -9,7 +9,7 @@ git\-bug\-user\-adopt \- Adopt an existing identity as your own.
 
 .SH SYNOPSIS
 .PP
-\fBgit\-bug user adopt  [flags]\fP
+\fBgit\-bug user adopt USER\-ID [flags]\fP
 
 
 .SH DESCRIPTION
diff --git a/doc/man/git-bug-user.1 b/doc/man/git-bug-user.1
index 5a4cf439c36908c92c43a6d7fa3c835c1fb4fddc..a454b56caed3c1a00d9d2b7806d21f953d652f57 100644
--- a/doc/man/git-bug-user.1
+++ b/doc/man/git-bug-user.1
@@ -9,7 +9,7 @@ git\-bug\-user \- Display or change the user identity.
 
 .SH SYNOPSIS
 .PP
-\fBgit\-bug user [] [flags]\fP
+\fBgit\-bug user [USER\-ID] [flags]\fP
 
 
 .SH DESCRIPTION
diff --git a/doc/man/git-bug.1 b/doc/man/git-bug.1
index b9e5d758f553f366f95e356fcc297aa96b65f6f1..ecb35febc18630cf07b0961cbf4198f84d9e74b1 100644
--- a/doc/man/git-bug.1
+++ b/doc/man/git-bug.1
@@ -30,4 +30,4 @@ the same git remote you are already using to collaborate with other people.
 
 .SH SEE ALSO
 .PP
-\fBgit\-bug\-add(1)\fP, \fBgit\-bug\-bridge(1)\fP, \fBgit\-bug\-commands(1)\fP, \fBgit\-bug\-comment(1)\fP, \fBgit\-bug\-deselect(1)\fP, \fBgit\-bug\-label(1)\fP, \fBgit\-bug\-ls(1)\fP, \fBgit\-bug\-ls\-id(1)\fP, \fBgit\-bug\-ls\-label(1)\fP, \fBgit\-bug\-pull(1)\fP, \fBgit\-bug\-push(1)\fP, \fBgit\-bug\-select(1)\fP, \fBgit\-bug\-show(1)\fP, \fBgit\-bug\-status(1)\fP, \fBgit\-bug\-termui(1)\fP, \fBgit\-bug\-title(1)\fP, \fBgit\-bug\-user(1)\fP, \fBgit\-bug\-version(1)\fP, \fBgit\-bug\-webui(1)\fP
+\fBgit\-bug\-add(1)\fP, \fBgit\-bug\-bridge(1)\fP, \fBgit\-bug\-commands(1)\fP, \fBgit\-bug\-comment(1)\fP, \fBgit\-bug\-deselect(1)\fP, \fBgit\-bug\-label(1)\fP, \fBgit\-bug\-ls(1)\fP, \fBgit\-bug\-ls\-id(1)\fP, \fBgit\-bug\-ls\-label(1)\fP, \fBgit\-bug\-pull(1)\fP, \fBgit\-bug\-push(1)\fP, \fBgit\-bug\-rm(1)\fP, \fBgit\-bug\-select(1)\fP, \fBgit\-bug\-show(1)\fP, \fBgit\-bug\-status(1)\fP, \fBgit\-bug\-termui(1)\fP, \fBgit\-bug\-title(1)\fP, \fBgit\-bug\-user(1)\fP, \fBgit\-bug\-version(1)\fP, \fBgit\-bug\-webui(1)\fP
diff --git a/doc/md/git-bug.md b/doc/md/git-bug.md
index 5a736f34bee0ff992307b527aa6383a1a25edd3f..99b554e2a8fe9cf90391abc56a80beb0de0b130e 100644
--- a/doc/md/git-bug.md
+++ b/doc/md/git-bug.md
@@ -35,6 +35,7 @@ git-bug [flags]
 * [git-bug ls-label](git-bug_ls-label.md)	 - List valid labels.
 * [git-bug pull](git-bug_pull.md)	 - Pull bugs update from a git remote.
 * [git-bug push](git-bug_push.md)	 - Push bugs update to a git remote.
+* [git-bug rm](git-bug_rm.md)	 - Remove an existing bug.
 * [git-bug select](git-bug_select.md)	 - Select a bug for implicit use in future commands.
 * [git-bug show](git-bug_show.md)	 - Display the details of a bug.
 * [git-bug status](git-bug_status.md)	 - Display or change a bug status.
diff --git a/doc/md/git-bug_bridge_auth_add-token.md b/doc/md/git-bug_bridge_auth_add-token.md
index f0f8ac72ee03441935d0223e7eadb09b95095812..c64665220a8a23cc2a9bc72462b81b321fed9d6f 100644
--- a/doc/md/git-bug_bridge_auth_add-token.md
+++ b/doc/md/git-bug_bridge_auth_add-token.md
@@ -7,7 +7,7 @@ Store a new token
 Store a new token
 
 ```
-git-bug bridge auth add-token [<token>] [flags]
+git-bug bridge auth add-token [TOKEN] [flags]
 ```
 
 ### Options
diff --git a/doc/md/git-bug_bridge_auth_rm.md b/doc/md/git-bug_bridge_auth_rm.md
index 059aa43dcdd709e538f4116323499a8ea9451cac..cf470c0c74009c98034346ed477460d84e4287a5 100644
--- a/doc/md/git-bug_bridge_auth_rm.md
+++ b/doc/md/git-bug_bridge_auth_rm.md
@@ -7,7 +7,7 @@ Remove a credential.
 Remove a credential.
 
 ```
-git-bug bridge auth rm <id> [flags]
+git-bug bridge auth rm ID [flags]
 ```
 
 ### Options
diff --git a/doc/md/git-bug_bridge_pull.md b/doc/md/git-bug_bridge_pull.md
index fea92b85c662b49635137498e0f9a0132a1271bf..784bf99c15744a92fdd43afb73a647e6d4c42dcf 100644
--- a/doc/md/git-bug_bridge_pull.md
+++ b/doc/md/git-bug_bridge_pull.md
@@ -7,7 +7,7 @@ Pull updates.
 Pull updates.
 
 ```
-git-bug bridge pull [<name>] [flags]
+git-bug bridge pull [NAME] [flags]
 ```
 
 ### Options
diff --git a/doc/md/git-bug_bridge_push.md b/doc/md/git-bug_bridge_push.md
index 35436dd66b592b70fdc52cfdd7717795e3138d63..387270e213a032601c00b71b0f519dd92091d9c5 100644
--- a/doc/md/git-bug_bridge_push.md
+++ b/doc/md/git-bug_bridge_push.md
@@ -7,7 +7,7 @@ Push updates.
 Push updates.
 
 ```
-git-bug bridge push [<name>] [flags]
+git-bug bridge push [NAME] [flags]
 ```
 
 ### Options
diff --git a/doc/md/git-bug_bridge_rm.md b/doc/md/git-bug_bridge_rm.md
index 54941b2f8fa69cb5bae71f23aabf48ecbeb06b84..748011f29ed25713566de7a4f8166a4c8e062541 100644
--- a/doc/md/git-bug_bridge_rm.md
+++ b/doc/md/git-bug_bridge_rm.md
@@ -7,7 +7,7 @@ Delete a configured bridge.
 Delete a configured bridge.
 
 ```
-git-bug bridge rm <name> [flags]
+git-bug bridge rm NAME [flags]
 ```
 
 ### Options
diff --git a/doc/md/git-bug_commands.md b/doc/md/git-bug_commands.md
index e1a409d270d75b6165d18ee61b3a6e6a7c5b302e..00eef4224264f13c954a33da3c33089611d210f4 100644
--- a/doc/md/git-bug_commands.md
+++ b/doc/md/git-bug_commands.md
@@ -7,7 +7,7 @@ Display available commands.
 Display available commands.
 
 ```
-git-bug commands [<option>...] [flags]
+git-bug commands [flags]
 ```
 
 ### Options
diff --git a/doc/md/git-bug_comment.md b/doc/md/git-bug_comment.md
index 5a79cf6f230772744134707c6a14aecfb62941a0..60c4ee882b42a6f36c0d8fd77d25ddc040343970 100644
--- a/doc/md/git-bug_comment.md
+++ b/doc/md/git-bug_comment.md
@@ -7,7 +7,7 @@ Display or add comments to a bug.
 Display or add comments to a bug.
 
 ```
-git-bug comment [<id>] [flags]
+git-bug comment [ID] [flags]
 ```
 
 ### Options
diff --git a/doc/md/git-bug_comment_add.md b/doc/md/git-bug_comment_add.md
index 51114f7d9bb27c7f38546c51e77b68463f0e5b5c..64bd840ce4f74e4897c173f5e819a83e12cb7152 100644
--- a/doc/md/git-bug_comment_add.md
+++ b/doc/md/git-bug_comment_add.md
@@ -7,7 +7,7 @@ Add a new comment to a bug.
 Add a new comment to a bug.
 
 ```
-git-bug comment add [<id>] [flags]
+git-bug comment add [ID] [flags]
 ```
 
 ### Options
diff --git a/doc/md/git-bug_label.md b/doc/md/git-bug_label.md
index 5ac7c2e65ab221957670897eb920c636116adcdd..a847af3dfedd058ee5fb342de9ea2cffbf77a5e1 100644
--- a/doc/md/git-bug_label.md
+++ b/doc/md/git-bug_label.md
@@ -7,7 +7,7 @@ Display, add or remove labels to/from a bug.
 Display, add or remove labels to/from a bug.
 
 ```
-git-bug label [<id>] [flags]
+git-bug label [ID] [flags]
 ```
 
 ### Options
diff --git a/doc/md/git-bug_label_add.md b/doc/md/git-bug_label_add.md
index ee0a82ad142168c83061e12a5b4149e60e367327..9900b52d4fee113abb38212fd0db0faa7eea1bdd 100644
--- a/doc/md/git-bug_label_add.md
+++ b/doc/md/git-bug_label_add.md
@@ -7,7 +7,7 @@ Add a label to a bug.
 Add a label to a bug.
 
 ```
-git-bug label add [<id>] <label>[...] [flags]
+git-bug label add [ID] LABEL... [flags]
 ```
 
 ### Options
diff --git a/doc/md/git-bug_label_rm.md b/doc/md/git-bug_label_rm.md
index b447f44d8a486f6facc9329b139c0551c8237d89..fa6d1aa32e5971b97b57bd5be779d6c3c5fff583 100644
--- a/doc/md/git-bug_label_rm.md
+++ b/doc/md/git-bug_label_rm.md
@@ -7,7 +7,7 @@ Remove a label from a bug.
 Remove a label from a bug.
 
 ```
-git-bug label rm [<id>] <label>[...] [flags]
+git-bug label rm [ID] LABEL... [flags]
 ```
 
 ### Options
diff --git a/doc/md/git-bug_ls-id.md b/doc/md/git-bug_ls-id.md
index 0117474c90dd27f2d0e825dd5394d6c8255e138b..134f3aec9edc2be530927d2a1a6fc54c16b2fb79 100644
--- a/doc/md/git-bug_ls-id.md
+++ b/doc/md/git-bug_ls-id.md
@@ -7,7 +7,7 @@ List bug identifiers.
 List bug identifiers.
 
 ```
-git-bug ls-id [<prefix>] [flags]
+git-bug ls-id [PREFIX] [flags]
 ```
 
 ### Options
diff --git a/doc/md/git-bug_ls.md b/doc/md/git-bug_ls.md
index 1532efab0d50183f89c7a680e647b2d2e6e57bc5..e2721c7282444456c827c4959c9017e5fe803744 100644
--- a/doc/md/git-bug_ls.md
+++ b/doc/md/git-bug_ls.md
@@ -9,7 +9,7 @@ Display a summary of each bugs.
 You can pass an additional query to filter and order the list. This query can be expressed either with a simple query language or with flags.
 
 ```
-git-bug ls [<query>] [flags]
+git-bug ls [QUERY] [flags]
 ```
 
 ### Examples
diff --git a/doc/md/git-bug_pull.md b/doc/md/git-bug_pull.md
index 1519c87fd7c357e68c788ece48acfbf5d2e761d2..cf29e079d4c448b08cd7d5e6fc04b2522f6a33db 100644
--- a/doc/md/git-bug_pull.md
+++ b/doc/md/git-bug_pull.md
@@ -7,7 +7,7 @@ Pull bugs update from a git remote.
 Pull bugs update from a git remote.
 
 ```
-git-bug pull [<remote>] [flags]
+git-bug pull [REMOTE] [flags]
 ```
 
 ### Options
diff --git a/doc/md/git-bug_push.md b/doc/md/git-bug_push.md
index 5e95ea2f3a7c9762674920ed464efcee357c3f32..226bc9516a6b07efb898da2e4e9fabf46cba2b69 100644
--- a/doc/md/git-bug_push.md
+++ b/doc/md/git-bug_push.md
@@ -7,7 +7,7 @@ Push bugs update to a git remote.
 Push bugs update to a git remote.
 
 ```
-git-bug push [<remote>] [flags]
+git-bug push [REMOTE] [flags]
 ```
 
 ### Options
diff --git a/doc/md/git-bug_rm.md b/doc/md/git-bug_rm.md
new file mode 100644
index 0000000000000000000000000000000000000000..3b77ce1c1741c5b2d956d05366b0f5d24032c7e4
--- /dev/null
+++ b/doc/md/git-bug_rm.md
@@ -0,0 +1,22 @@
+## git-bug rm
+
+Remove an existing bug.
+
+### Synopsis
+
+Remove an existing bug in the local repository. Note removing bugs that were imported from bridges will not remove the bug on the remote, and will only remove the local copy of the bug.
+
+```
+git-bug rm ID [flags]
+```
+
+### Options
+
+```
+  -h, --help   help for rm
+```
+
+### SEE ALSO
+
+* [git-bug](git-bug.md)	 - A bug tracker embedded in Git.
+
diff --git a/doc/md/git-bug_select.md b/doc/md/git-bug_select.md
index 6a851acb73728b3b0ce6c201e7d71e9d6d933348..b8a71120423cf17424314d345d3c222bd35ef430 100644
--- a/doc/md/git-bug_select.md
+++ b/doc/md/git-bug_select.md
@@ -6,7 +6,7 @@ Select a bug for implicit use in future commands.
 
 Select a bug for implicit use in future commands.
 
-This command allows you to omit any bug <id> argument, for example:
+This command allows you to omit any bug ID argument, for example:
   git bug show
 instead of
   git bug show 2f153ca
@@ -15,7 +15,7 @@ The complementary command is "git bug deselect" performing the opposite operatio
 
 
 ```
-git-bug select <id> [flags]
+git-bug select ID [flags]
 ```
 
 ### Examples
diff --git a/doc/md/git-bug_show.md b/doc/md/git-bug_show.md
index e6d2d7ba6616b3ecd3d73cee1303b83679de282a..1c6a4ab04bdea5e8ff8350b7024fcecdb33712c9 100644
--- a/doc/md/git-bug_show.md
+++ b/doc/md/git-bug_show.md
@@ -7,7 +7,7 @@ Display the details of a bug.
 Display the details of a bug.
 
 ```
-git-bug show [<id>] [flags]
+git-bug show [ID] [flags]
 ```
 
 ### Options
diff --git a/doc/md/git-bug_status.md b/doc/md/git-bug_status.md
index a04098e6e6e4ec1d3f96cc251c21d58399f3ab84..c2b380f379e399659585c91bcb298f8474bfe637 100644
--- a/doc/md/git-bug_status.md
+++ b/doc/md/git-bug_status.md
@@ -7,7 +7,7 @@ Display or change a bug status.
 Display or change a bug status.
 
 ```
-git-bug status [<id>] [flags]
+git-bug status [ID] [flags]
 ```
 
 ### Options
diff --git a/doc/md/git-bug_status_close.md b/doc/md/git-bug_status_close.md
index 4978341fde32bc57c32fb62093fe43ad2c4785b5..97081b5991b2c78d5081c18ac2e0c2d4a36539fe 100644
--- a/doc/md/git-bug_status_close.md
+++ b/doc/md/git-bug_status_close.md
@@ -7,7 +7,7 @@ Mark a bug as closed.
 Mark a bug as closed.
 
 ```
-git-bug status close [<id>] [flags]
+git-bug status close [ID] [flags]
 ```
 
 ### Options
diff --git a/doc/md/git-bug_status_open.md b/doc/md/git-bug_status_open.md
index f6d03215a389e9f3f6e0928c076e381ded98859b..661508ad6b3172f20f568f3a656a28b5621a3b41 100644
--- a/doc/md/git-bug_status_open.md
+++ b/doc/md/git-bug_status_open.md
@@ -7,7 +7,7 @@ Mark a bug as open.
 Mark a bug as open.
 
 ```
-git-bug status open [<id>] [flags]
+git-bug status open [ID] [flags]
 ```
 
 ### Options
diff --git a/doc/md/git-bug_title.md b/doc/md/git-bug_title.md
index cb3260712f4767137de2240cff5252b234b7e92c..5c5698e0f521d294d66107f87fed63db3ea53a2d 100644
--- a/doc/md/git-bug_title.md
+++ b/doc/md/git-bug_title.md
@@ -7,7 +7,7 @@ Display or change a title of a bug.
 Display or change a title of a bug.
 
 ```
-git-bug title [<id>] [flags]
+git-bug title [ID] [flags]
 ```
 
 ### Options
diff --git a/doc/md/git-bug_title_edit.md b/doc/md/git-bug_title_edit.md
index edf44a1a566920b23bac9486ec5da4ba9d7e2055..8119b8b5c9f9563aefcc7840f956dd62a91fcaf6 100644
--- a/doc/md/git-bug_title_edit.md
+++ b/doc/md/git-bug_title_edit.md
@@ -7,7 +7,7 @@ Edit a title of a bug.
 Edit a title of a bug.
 
 ```
-git-bug title edit [<id>] [flags]
+git-bug title edit [ID] [flags]
 ```
 
 ### Options
diff --git a/doc/md/git-bug_user.md b/doc/md/git-bug_user.md
index f2c783af223e4729ec88c9573737f1d3062c9a2e..4fc0dd544ee59e954f8ae13a0e530318498175f2 100644
--- a/doc/md/git-bug_user.md
+++ b/doc/md/git-bug_user.md
@@ -7,7 +7,7 @@ Display or change the user identity.
 Display or change the user identity.
 
 ```
-git-bug user [<user-id>] [flags]
+git-bug user [USER-ID] [flags]
 ```
 
 ### Options
diff --git a/doc/md/git-bug_user_adopt.md b/doc/md/git-bug_user_adopt.md
index 7bedace550c2d927497c8e640e41b4a8d52f9ed8..86682be068bf8f175bf5d24c41c90dc0f79c704d 100644
--- a/doc/md/git-bug_user_adopt.md
+++ b/doc/md/git-bug_user_adopt.md
@@ -7,7 +7,7 @@ Adopt an existing identity as your own.
 Adopt an existing identity as your own.
 
 ```
-git-bug user adopt <user-id> [flags]
+git-bug user adopt USER-ID [flags]
 ```
 
 ### Options
diff --git a/misc/bash_completion/git-bug b/misc/bash_completion/git-bug
index 4152725fb2f175d3591aa595d115612a864472cc..8e2de8dffce38f7deb5af11a090eeacf5f1c0842 100644
--- a/misc/bash_completion/git-bug
+++ b/misc/bash_completion/git-bug
@@ -897,6 +897,26 @@ _git-bug_push()
     noun_aliases=()
 }
 
+_git-bug_rm()
+{
+    last_command="git-bug_rm"
+
+    command_aliases=()
+
+    commands=()
+
+    flags=()
+    two_word_flags=()
+    local_nonpersistent_flags=()
+    flags_with_completion=()
+    flags_completion=()
+
+
+    must_have_one_flag=()
+    must_have_one_noun=()
+    noun_aliases=()
+}
+
 _git-bug_select()
 {
     last_command="git-bug_select"
@@ -1239,6 +1259,7 @@ _git-bug_root_command()
     commands+=("ls-label")
     commands+=("pull")
     commands+=("push")
+    commands+=("rm")
     commands+=("select")
     commands+=("show")
     commands+=("status")
diff --git a/misc/gen_completion.go b/misc/gen_completion.go
index 80b8990249073e846e90e7a6aba892d77c36f07c..0bc546f7d14049206dcdc1dca20768cbc1e95418 100644
--- a/misc/gen_completion.go
+++ b/misc/gen_completion.go
@@ -6,13 +6,17 @@ import (
 	"path"
 	"sync"
 
+	"github.com/spf13/cobra"
+
 	"github.com/MichaelMure/git-bug/commands"
 )
 
 func main() {
 	fmt.Println("Generating completion files ...")
 
-	tasks := map[string]func() error{
+	root := commands.NewRootCommand()
+
+	tasks := map[string]func(*cobra.Command) error{
 		"Bash":       genBash,
 		"Fish":       genFish,
 		"PowerShell": genPowerShell,
@@ -22,9 +26,9 @@ func main() {
 	var wg sync.WaitGroup
 	for name, f := range tasks {
 		wg.Add(1)
-		go func(name string, f func() error) {
+		go func(name string, f func(*cobra.Command) error) {
 			defer wg.Done()
-			err := f()
+			err := f(root)
 			if err != nil {
 				fmt.Printf("  - %s: %v\n", name, err)
 				return
@@ -36,26 +40,26 @@ func main() {
 	wg.Wait()
 }
 
-func genBash() error {
+func genBash(root *cobra.Command) error {
 	cwd, _ := os.Getwd()
 	dir := path.Join(cwd, "misc", "bash_completion", "git-bug")
-	return commands.NewRootCommand().GenBashCompletionFile(dir)
+	return root.GenBashCompletionFile(dir)
 }
 
-func genFish() error {
+func genFish(root *cobra.Command) error {
 	cwd, _ := os.Getwd()
 	dir := path.Join(cwd, "misc", "fish_completion", "git-bug")
-	return commands.NewRootCommand().GenFishCompletionFile(dir, true)
+	return root.GenFishCompletionFile(dir, true)
 }
 
-func genPowerShell() error {
+func genPowerShell(root *cobra.Command) error {
 	cwd, _ := os.Getwd()
 	filepath := path.Join(cwd, "misc", "powershell_completion", "git-bug")
-	return commands.NewRootCommand().GenPowerShellCompletionFile(filepath)
+	return root.GenPowerShellCompletionFile(filepath)
 }
 
-func genZsh() error {
+func genZsh(root *cobra.Command) error {
 	cwd, _ := os.Getwd()
 	filepath := path.Join(cwd, "misc", "zsh_completion", "git-bug")
-	return commands.NewRootCommand().GenZshCompletionFile(filepath)
+	return root.GenZshCompletionFile(filepath)
 }
diff --git a/misc/powershell_completion/git-bug b/misc/powershell_completion/git-bug
index 40831a119b80cc9b23538d8f95354d1d34b12b06..c2aa0adf8bd018ac92e9c6e445362cd56b1cb9eb 100644
--- a/misc/powershell_completion/git-bug
+++ b/misc/powershell_completion/git-bug
@@ -28,6 +28,7 @@ Register-ArgumentCompleter -Native -CommandName 'git-bug' -ScriptBlock {
             [CompletionResult]::new('ls-label', 'ls-label', [CompletionResultType]::ParameterValue, 'List valid labels.')
             [CompletionResult]::new('pull', 'pull', [CompletionResultType]::ParameterValue, 'Pull bugs update from a git remote.')
             [CompletionResult]::new('push', 'push', [CompletionResultType]::ParameterValue, 'Push bugs update to a git remote.')
+            [CompletionResult]::new('rm', 'rm', [CompletionResultType]::ParameterValue, 'Remove an existing bug.')
             [CompletionResult]::new('select', 'select', [CompletionResultType]::ParameterValue, 'Select a bug for implicit use in future commands.')
             [CompletionResult]::new('show', 'show', [CompletionResultType]::ParameterValue, 'Display the details of a bug.')
             [CompletionResult]::new('status', 'status', [CompletionResultType]::ParameterValue, 'Display or change a bug status.')
@@ -175,6 +176,9 @@ Register-ArgumentCompleter -Native -CommandName 'git-bug' -ScriptBlock {
         'git-bug;push' {
             break
         }
+        'git-bug;rm' {
+            break
+        }
         'git-bug;select' {
             break
         }
diff --git a/misc/zsh_completion/git-bug b/misc/zsh_completion/git-bug
index fbd52be5c198a5c53803f946957b271ea246e8a5..4ae1038208c1d7954de0c880733a9637352d4647 100644
--- a/misc/zsh_completion/git-bug
+++ b/misc/zsh_completion/git-bug
@@ -22,6 +22,7 @@ function _git-bug {
       "ls-label:List valid labels."
       "pull:Pull bugs update from a git remote."
       "push:Push bugs update to a git remote."
+      "rm:Remove an existing bug."
       "select:Select a bug for implicit use in future commands."
       "show:Display the details of a bug."
       "status:Display or change a bug status."
@@ -69,6 +70,9 @@ function _git-bug {
   push)
     _git-bug_push
     ;;
+  rm)
+    _git-bug_rm
+    ;;
   select)
     _git-bug_select
     ;;
@@ -323,6 +327,10 @@ function _git-bug_push {
   _arguments
 }
 
+function _git-bug_rm {
+  _arguments
+}
+
 function _git-bug_select {
   _arguments
 }