@@ -14,24 +14,23 @@ import (
14
14
)
15
15
16
16
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
35
34
)
36
35
37
36
// NewRootCmd creates the root command for the gh-combine CLI
@@ -84,7 +83,6 @@ func NewRootCmd() *cobra.Command {
84
83
# Additional options
85
84
gh combine octocat/hello-world --autoclose # Close source PRs when combined PR is merged
86
85
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
88
86
gh combine octocat/hello-world --update-branch # Update the branch of the combined PR` ,
89
87
RunE : runCombine ,
90
88
}
@@ -111,7 +109,6 @@ func NewRootCmd() *cobra.Command {
111
109
rootCmd .Flags ().BoolVar (& mustBeApproved , "require-approved" , false , "Only include PRs that have been approved" )
112
110
rootCmd .Flags ().BoolVar (& autoclose , "autoclose" , false , "Close source PRs when combined PR is merged" )
113
111
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)" )
115
112
rootCmd .Flags ().StringVar (& baseBranch , "base-branch" , "main" , "Base branch for the combined PR (default: main)" )
116
113
rootCmd .Flags ().StringVar (& reposFile , "file" , "" , "File containing repository names, one per line" )
117
114
rootCmd .Flags ().IntVar (& minimum , "minimum" , 2 , "Minimum number of PRs to combine" )
0 commit comments