Skip to content

Commit 0b1df64

Browse files
authored
Merge pull request #3280 from carapace-sh/but-updates-0.19.3
but: updates from 0.19.3
2 parents 3399ef8 + a154721 commit 0b1df64

File tree

5 files changed

+28
-6
lines changed

5 files changed

+28
-6
lines changed

completers/common/but_completer/cmd/pr.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@ import (
77

88
var prCmd = &cobra.Command{
99
Use: "pr",
10-
Short: "Commands for creating and managing pull requests on a forge",
10+
Short: "Commands for creating and managing reviews on a forge, e.g. GitHub PRs or GitLab MRs",
1111
Aliases: []string{"review", "mr"},
1212
Run: func(cmd *cobra.Command, args []string) {},
1313
}
1414

1515
func init() {
1616
carapace.Gen(prCmd).Standalone()
1717

18+
prCmd.Flags().BoolP("draft", "d", false, "Whether to create reviews as a draft")
1819
prCmd.Flags().BoolP("help", "h", false, "Print help (see more with '--help')")
1920
rootCmd.AddCommand(prCmd)
2021
}

completers/common/but_completer/cmd/pr_new.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,18 @@ import (
88

99
var pr_newCmd = &cobra.Command{
1010
Use: "new",
11-
Short: "Create a new pull request for a branch. If no branch is specified, you will be prompted to select one. If there is only one branch without a PR, you will be asked to confirm",
11+
Short: "Create a new review for a branch. If no branch is specified, you will be prompted to select one. If there is only one branch without a review, you will be asked to confirm",
1212
Run: func(cmd *cobra.Command, args []string) {},
1313
}
1414

1515
func init() {
1616
carapace.Gen(pr_newCmd).Standalone()
1717

18-
pr_newCmd.Flags().BoolP("default", "t", false, "Use the default content for the PR title and description, skipping any prompts. If the branch contains only a single commit, the commit message will be used")
19-
pr_newCmd.Flags().StringP("file", "F", "", "Read PR title and description from file. The first line is the title, the rest is the description")
18+
pr_newCmd.Flags().BoolP("default", "t", false, "Use the default content for the review title and description, skipping any prompts. If the branch contains only a single commit, the commit message will be used")
19+
pr_newCmd.Flags().BoolP("draft", "d", false, "Whether to create reviews as a draft")
20+
pr_newCmd.Flags().StringP("file", "F", "", "Read review title and description from file. The first line is the title, the rest is the description")
2021
pr_newCmd.Flags().BoolP("help", "h", false, "Print help (see more with '--help')")
21-
pr_newCmd.Flags().StringP("message", "m", "", "PR title and description. The first line is the title, the rest is the description")
22+
pr_newCmd.Flags().StringP("message", "m", "", "review title and description. The first line is the title, the rest is the description")
2223
pr_newCmd.Flags().BoolP("run-hooks", "r", false, "Run pre-push hooks (defaults to true)")
2324
pr_newCmd.Flags().BoolP("skip-force-push-protection", "s", false, "Skip force push protection checks")
2425
pr_newCmd.Flags().BoolP("with-force", "f", false, "Force push even if it's not fast-forward (defaults to true)")

completers/common/but_completer/cmd/pr_template.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88

99
var pr_templateCmd = &cobra.Command{
1010
Use: "template",
11-
Short: "Configure the template to use for PR descriptions. This will list all available templates found in the repository and allow you to select one",
11+
Short: "Configure the template to use for review descriptions. This will list all available templates found in the repository and allow you to select one",
1212
Run: func(cmd *cobra.Command, args []string) {},
1313
}
1414

completers/common/but_completer/cmd/resolve_cancel.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ var resolve_cancelCmd = &cobra.Command{
1414
func init() {
1515
carapace.Gen(resolve_cancelCmd).Standalone()
1616

17+
resolve_cancelCmd.Flags().BoolP("force", "f", false, "Forcibly remove any changes made")
1718
resolve_cancelCmd.Flags().BoolP("help", "h", false, "Print help (see more with '--help')")
1819
resolveCmd.AddCommand(resolve_cancelCmd)
1920
}
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
package cmd
2+
3+
import (
4+
"github.com/carapace-sh/carapace"
5+
"github.com/spf13/cobra"
6+
)
7+
8+
var update_installCmd = &cobra.Command{
9+
Use: "install",
10+
Short: "Install or update the GitButler desktop application",
11+
Run: func(cmd *cobra.Command, args []string) {},
12+
}
13+
14+
func init() {
15+
carapace.Gen(update_installCmd).Standalone()
16+
17+
update_installCmd.Flags().BoolP("help", "h", false, "Print help (see more with '--help')")
18+
updateCmd.AddCommand(update_installCmd)
19+
}

0 commit comments

Comments
 (0)