Jari Aalto <jari.aalto@xxxxxxxxx> writes: > Present the options in -s|--long (short, long) order. This is a good change (but might not make sense without the following one)... > Mention merge and new whitespace option. ...and this is not; usage string is now too long. Please either use placeholder ([<whitespace>]), or enumerate only short version of commands ([-i] [-v] [-m]) in synopsis, or break synopsis into lines 80-column lines max. > -USAGE='[--interactive | -i] [-v] [--onto <newbase>] <upstream> [<branch>]' > +USAGE='[-i|--interactive] [-v|--verbose] [--whitespace={nowarn|warn|error|error-all|strip}] [-m|--merge] [--onto <newbase>] <upstream> [<branch>]' -- Jakub Narebski Poland ShadeHawk on #git - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html