diff options
Diffstat (limited to 'argv.go')
| -rw-r--r-- | argv.go | 9 |
1 files changed, 8 insertions, 1 deletions
@@ -20,9 +20,10 @@ type args struct { Commit *CommitCmd `arg:"subcommand:commit" help:"'git commit' but errors out if on wrong branch"` Config *ConfigCmd `arg:"subcommand:config" help:"show your .config/forge/ settings"` Debug *DebugCmd `arg:"subcommand:debug" help:"debug forge"` - Dirty *DirtyCmd `arg:"subcommand:dirty" help:"show repos git says are dirty"` + Dirty *DirtyCmd `arg:"subcommand:dirty" help:"show dirty git repos"` GitFetch *FindCmd `arg:"subcommand:fetch" help:"run 'git fetch master'"` List *FindCmd `arg:"subcommand:list" help:"print a table of the current repos"` + Merge *MergeCmd `arg:"subcommand:merge" help:"merge branches"` Patch *PatchCmd `arg:"subcommand:patch" help:"make patchsets"` Pull *PullCmd `arg:"subcommand:pull" help:"run 'git pull'"` URL string `arg:"--connect" help:"forge url"` @@ -106,6 +107,12 @@ type CheckoutCmd struct { Master *FindCmd `arg:"subcommand:master" help:"git checkout master"` } +type MergeCmd struct { + Devel *FindCmd `arg:"subcommand:devel" help:"merge user to devel"` + Master *FindCmd `arg:"subcommand:master" help:"merge devel to master"` + Publish *EmptyCmd `arg:"subcommand:publish" help:"increment versions and publish master branch"` +} + type SyncCmd struct { Clean *EmptyCmd `arg:"subcommand:clean" help:"sync everything to upstream master"` User *EmptyCmd `arg:"subcommand:user" help:"sync everything to user"` |