improve command syntax in help text

Some of these commands can take a useries too, which is not a
commit-ish. Also some commands can work on the currently checked-out
umerge or utag, so in this case an argument is optional.

umpf

@@ -197,21 +197,21 @@ usage() {
 	  -v, --version <version>    with tag: overwrite version number [default: 1]
 
 	Commands:
-	  diff <commit-ish>          show patches not in any topic branch (not
+	  diff <umpf|commit-ish>     show patches not in any topic branch (not
 	                             upstream) and patches missing locally
-	  show <commit-ish>          show an useries file from an umpf
+	  show [umpf|commit-ish]     show an useries file from an umpf
 	  tig [umpf]                 browse an umpf interactively, showing state of
 	                             local, remote and remote-tracking topic branches
 
-	  tag <commit-ish>           generate a utag from an umerge
-	  format-patch <utag>        generate a useries file and patch stack
+	  tag [umpf]                 generate a utag from an umerge or useries
+	  format-patch [utag]        generate a useries file and patch stack
 	                             from a utag
 
-	  merge <commit-ish> [<name>]merge one a topic branches into current
-	                             head, like git merge, but umpf compatible
+	  merge <commit-ish> [<name>]merge one topic branches into current
+	                             head, like git merge, but umpf compatible.
 	                             Use <name> as topic name if specified.
 	                             Otherwise <commit-ish> must be the correct
-	                             topic name. The remote is removed if necessary
+	                             topic name. The remote is removed if necessary.
 	  build <umpf>               build an umerge from another umpf
 	  distribute <commit-ish>    push patches not yet in any topic branch
 	                             upstream