fix conflicting flags

brentp · Nov 13, 2016 · a4e4fb1 · a4e4fb1
1 parent 341987a
commit a4e4fb1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -147,7 +147,7 @@ options:
                          times to retry a command if it fails (default is 0).
   --ordered, -o          keep output in order of input.
   --verbose, -v          print commands to stderr as they are executed.
-  --stop-on-error, -s    stop all processes on any error.
+  --stop-on-error, -e    stop all processes on any error.
   --dry-run, -d          print (but do not run) the commands.
   --log LOG, -l LOG      file to log commands. Successful commands are prefixed with '#'.
   --help, -h             display this help and exit

diff --git a/main.go b/main.go
@@ -34,7 +34,7 @@ type Params struct {
 	Retry       int      `arg:"-r,help:times to retry a command if it fails (default is 0)."`
 	Ordered     bool     `arg:"-o,help:keep output in order of input."`
 	Verbose     bool     `arg:"-v,help:print commands to stderr as they are executed."`
-	StopOnError bool     `arg:"-s,--stop-on-error,help:stop all processes on any error."`
+	StopOnError bool     `arg:"-e,--stop-on-error,help:stop all processes on any error."`
 	DryRun      bool     `arg:"-d,--dry-run,help:print (but do not run) the commands."`
 	Log         string   `arg:"-l,--log,help:file to log commands. Successful commands are prefixed with '#'."`
 	Command     string   `arg:"positional,required,help:command template to fill and execute."`