From 24dece9418a4205b9b2c8468b5686bceeb3da824 Mon Sep 17 00:00:00 2001 From: Corey Johnson Date: Tue, 12 May 2020 09:45:22 -0700 Subject: [PATCH] Name flag `delete-branch` Co-Authored-By: Nate Smith --- command/pr.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/command/pr.go b/command/pr.go index b93976600..9f274333d 100644 --- a/command/pr.go +++ b/command/pr.go @@ -29,7 +29,7 @@ func init() { prCmd.AddCommand(prCloseCmd) prCmd.AddCommand(prReopenCmd) prCmd.AddCommand(prMergeCmd) - prMergeCmd.Flags().BoolP("delete", "d", true, "Delete the local branch after merge") + prMergeCmd.Flags().BoolP("delete-branch", "d", true, "Delete the local branch after merge") prMergeCmd.Flags().BoolP("merge", "m", true, "Merge the commits with the base branch") prMergeCmd.Flags().BoolP("rebase", "r", false, "Rebase the commits onto the base branch") prMergeCmd.Flags().BoolP("squash", "s", false, "Squash the commits into one commit and merge it into the base branch") @@ -475,7 +475,7 @@ func prMerge(cmd *cobra.Command, args []string) error { } mergeMethod := api.PullRequestMergeMethodMerge - deleteBranch, err := cmd.Flags().GetBool("delete") + deleteBranch, err := cmd.Flags().GetBool("delete-branch") if err != nil { return nil }