delete applied patches from PB filev0.25.30

1 files changed, 6 insertions, 5 deletions

diff --git a/argv.go b/argv.go
index 0e8dd1d..814c75d 100644
--- a/argv.go
+++ b/argv.go
@@ -18,7 +18,7 @@ var argv args
 
 type args struct {
 	Checkout *CheckoutCmd `arg:"subcommand:checkout"                  help:"switch branches using 'git checkout'"`
-	Clean    *CleanCmd    `arg:"subcommand:clean"                     help:"start over at the beginning"`
+	Clean    *CleanCmd    `arg:"subcommand:reset"                     help:"reset all git repos to the original state"`
 	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"`
 	Gui      *EmptyCmd    `arg:"subcommand:gui"                       help:"open the gui"`
@@ -35,9 +35,10 @@ type args struct {
 
 func (args) Examples() string {
 	var out string
-	out += "forge merge --all     # merge all patches to devel & master\n"
 	out += "forge pull --force    # 'git pull' on all repos\n"
-	out += "forge normal          # the defaults for 'normal' forge distributed development\n"
+	out += "forge merge --all     # merge all patches to devel & master\n"
+	out += "forge normal fix      # the defaults for 'normal' forge distributed development (makes local user branches)\n"
+	out += "forge reset fix       # smartly restore all git repos to the upstream state (removes changes forge might have made)\n"
 	return out
 }
 
@@ -86,7 +87,7 @@ type DevCmd struct {
 
 type CleanCmd struct {
 	Fix  *EmptyCmd `arg:"subcommand:fix"              help:"try to fix problems"`
-	Repo string    `arg:"--repo"                      help:"which repo to look at"`
+	Repo string    `arg:"--repo"                      help:"work on one specific git repository"`
 }
 
 // matches
@@ -205,7 +206,7 @@ func (args) Appname() string {
 
 func (a args) DoAutoComplete(pb *prep.Auto) {
 	if pb.Cmd == "" {
-		pb.Autocomplete3([]string{"checkout", "clean", "commit", "config", "gui", "merge", "normal", "patch", "pull", "show"})
+		pb.Autocomplete3([]string{"checkout", "reset", "commit", "config", "gui", "merge", "normal", "patch", "pull", "show"})
 	} else {
 		pb.SubCommand(pb.Argv...)
 	}