diff --git a/commands/comment.go b/commands/comment.go
index 0f45c18d422b9748518de2639ebb0e3fd24e6d5e..35937e2b0f4148604f301479f89e6c51d4e8775d 100644
--- a/commands/comment.go
+++ b/commands/comment.go
@@ -65,7 +65,7 @@ func runComment(cmd *cobra.Command, args []string) error {
 }
 
 var commentCmd = &cobra.Command{
-	Use:   "comment <id> [<options>...]",
+	Use:   "comment <id>",
 	Short: "Add a new comment to a bug",
 	RunE:  runComment,
 }
diff --git a/commands/label.go b/commands/label.go
index b545852f9ce7fc86d61507778c4e3a12b42ad263..713d9b351466878ed0341e1ef30859252bba8af1 100644
--- a/commands/label.go
+++ b/commands/label.go
@@ -49,7 +49,7 @@ func runLabel(cmd *cobra.Command, args []string) error {
 }
 
 var labelCmd = &cobra.Command{
-	Use:   "label [<option>...] <id> [<label>...]",
+	Use:   "label <id> [<label>...]",
 	Short: "Manipulate bug's label",
 	RunE:  runLabel,
 }
diff --git a/commands/new.go b/commands/new.go
index ce6479f10be16d78c40917ec7486f332dc768675..c7846aea7519cc8c97fad5d7505678fd423bf7fc 100644
--- a/commands/new.go
+++ b/commands/new.go
@@ -53,7 +53,7 @@ func runNewBug(cmd *cobra.Command, args []string) error {
 }
 
 var newCmd = &cobra.Command{
-	Use:   "new [<option>...]",
+	Use:   "new",
 	Short: "Create a new bug",
 	RunE:  runNewBug,
 }
diff --git a/doc/man/git-bug-comment.1 b/doc/man/git-bug-comment.1
index 3996f279c3c02aa5b38d8c039eb610c8401cc8c5..da2cfa249f14666590564bb68003df1b896c1d6a 100644
--- a/doc/man/git-bug-comment.1
+++ b/doc/man/git-bug-comment.1
@@ -10,7 +10,7 @@ git\-bug\-comment \- Add a new comment to a bug
 
 .SH SYNOPSIS
 .PP
-\fBgit\-bug comment <id> [<options>\&...] [flags]\fP
+\fBgit\-bug comment <id> [flags]\fP
 
 
 .SH DESCRIPTION
diff --git a/doc/man/git-bug-label.1 b/doc/man/git-bug-label.1
index 8daee4bfb86556a9335d463d6ef64f3b789a291f..6f50dd103a2fff2974722ded1b0e0dceeeee2785 100644
--- a/doc/man/git-bug-label.1
+++ b/doc/man/git-bug-label.1
@@ -10,7 +10,7 @@ git\-bug\-label \- Manipulate bug's label
 
 .SH SYNOPSIS
 .PP
-\fBgit\-bug label [<option>\&...] <id> [<label>\&...] [flags]\fP
+\fBgit\-bug label <id> [<label>\&...] [flags]\fP
 
 
 .SH DESCRIPTION
diff --git a/doc/man/git-bug-new.1 b/doc/man/git-bug-new.1
index 17efc1f71f21df938c65bf01bda98ed4a4b07721..b0f0ae8b3911fb506a8386c6a4d18dd733afc6e6 100644
--- a/doc/man/git-bug-new.1
+++ b/doc/man/git-bug-new.1
@@ -10,7 +10,7 @@ git\-bug\-new \- Create a new bug
 
 .SH SYNOPSIS
 .PP
-\fBgit\-bug new [<option>\&...] [flags]\fP
+\fBgit\-bug new [flags]\fP
 
 
 .SH DESCRIPTION
diff --git a/doc/md/git-bug_comment.md b/doc/md/git-bug_comment.md
index 432cd3cbaa13000852201a6dbe5938b2c876013a..87541f8af7ae3baee15f59855277f7286ac0f954 100644
--- a/doc/md/git-bug_comment.md
+++ b/doc/md/git-bug_comment.md
@@ -7,7 +7,7 @@ Add a new comment to a bug
 Add a new comment to a bug
 
 ```
-git-bug comment <id> [<options>...] [flags]
+git-bug comment <id> [flags]
 ```
 
 ### Options
diff --git a/doc/md/git-bug_label.md b/doc/md/git-bug_label.md
index a6e6bf371cf44225dc384904bd266c4b0b757d3c..16efe4ed01b35987e06fd75686a289ea6890b19d 100644
--- a/doc/md/git-bug_label.md
+++ b/doc/md/git-bug_label.md
@@ -7,7 +7,7 @@ Manipulate bug's label
 Manipulate bug's label
 
 ```
-git-bug label [<option>...] <id> [<label>...] [flags]
+git-bug label <id> [<label>...] [flags]
 ```
 
 ### Options
diff --git a/doc/md/git-bug_new.md b/doc/md/git-bug_new.md
index 92edeb1231b77bbd13fef7b3baa5a4997a361a21..c04e944d525cf859bd0cc17534f703e5ea1decf0 100644
--- a/doc/md/git-bug_new.md
+++ b/doc/md/git-bug_new.md
@@ -7,7 +7,7 @@ Create a new bug
 Create a new bug
 
 ```
-git-bug new [<option>...] [flags]
+git-bug new [flags]
 ```
 
 ### Options
diff --git a/repository/git.go b/repository/git.go
index 5b5cbc3d608f3822cc900eecf22e1c644ce0ad3e..c5dc56183f43f031ec3a20289a3eb168fb7e8612 100644
--- a/repository/git.go
+++ b/repository/git.go
@@ -169,7 +169,7 @@ func (repo *GitRepo) PushRefs(remote string, refSpec string) (string, error) {
 	stdout, stderr, err := repo.runGitCommandRaw(nil, "push", remote, refSpec)
 
 	if err != nil {
-		return stdout + stderr, fmt.Errorf("failed to push to the remote '%s': %v", remote, err)
+		return stdout + stderr, fmt.Errorf("failed to push to the remote '%s': %v", remote, stderr)
 	}
 	return stdout + stderr, nil
 }