Skip to content

Commit b6bba2e

Browse files
committed
remove doNotCombineFromScratch for now as it is confusing
1 parent d45807b commit b6bba2e

File tree

1 file changed

+17
-20
lines changed

1 file changed

+17
-20
lines changed

internal/cmd/root.go

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,23 @@ import (
1414
)
1515

1616
var (
17-
branchPrefix string
18-
branchSuffix string
19-
branchRegex string
20-
selectLabel string
21-
selectLabels []string
22-
addLabels []string
23-
addAssignees []string
24-
requireCI bool
25-
mustBeApproved bool
26-
autoclose bool
27-
updateBranch bool
28-
ignoreLabel string
29-
ignoreLabels []string
30-
reposFile string
31-
minimum int
32-
defaultOwner string
33-
doNotCombineFromScratch bool
34-
baseBranch string
17+
branchPrefix string
18+
branchSuffix string
19+
branchRegex string
20+
selectLabel string
21+
selectLabels []string
22+
addLabels []string
23+
addAssignees []string
24+
requireCI bool
25+
mustBeApproved bool
26+
autoclose bool
27+
updateBranch bool
28+
ignoreLabel string
29+
ignoreLabels []string
30+
reposFile string
31+
minimum int
32+
defaultOwner string
33+
baseBranch string
3534
)
3635

3736
// NewRootCmd creates the root command for the gh-combine CLI
@@ -84,7 +83,6 @@ func NewRootCmd() *cobra.Command {
8483
# Additional options
8584
gh combine octocat/hello-world --autoclose # Close source PRs when combined PR is merged
8685
gh combine octocat/hello-world --base-branch main # Use a different base branch for the combined PR
87-
gh combine octocat/hello-world --do-not-combine-from-scratch # Do not combine the PRs from scratch
8886
gh combine octocat/hello-world --update-branch # Update the branch of the combined PR`,
8987
RunE: runCombine,
9088
}
@@ -111,7 +109,6 @@ func NewRootCmd() *cobra.Command {
111109
rootCmd.Flags().BoolVar(&mustBeApproved, "require-approved", false, "Only include PRs that have been approved")
112110
rootCmd.Flags().BoolVar(&autoclose, "autoclose", false, "Close source PRs when combined PR is merged")
113111
rootCmd.Flags().BoolVar(&updateBranch, "update-branch", false, "Update the branch of the combined PR if possible")
114-
rootCmd.Flags().BoolVar(&doNotCombineFromScratch, "do-not-combine-from-scratch", false, "Do not combine the PRs from scratch (clean)")
115112
rootCmd.Flags().StringVar(&baseBranch, "base-branch", "main", "Base branch for the combined PR (default: main)")
116113
rootCmd.Flags().StringVar(&reposFile, "file", "", "File containing repository names, one per line")
117114
rootCmd.Flags().IntVar(&minimum, "minimum", 2, "Minimum number of PRs to combine")

0 commit comments

Comments
 (0)