Present the options in -s|--long (short, long) order. Mention merge and new whitespace option. Signed-off-by: Jari Aalto <jari.aalto AT cante.net> --- *********************************************************************** reworked patch (No. 3) *********************************************************************** [Junio C Hamano} >> [--whitespace=nowarn|warn|error|error-all|strip] > > I think that is probably the right thing to do in this case. It > is clear where the alternatives end, without adding extra > grouping, so it keeps the description easy to read. git-rebase.sh | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/git-rebase.sh b/git-rebase.sh index bdcea0e..6128455 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -3,7 +3,10 @@ # Copyright (c) 2005 Junio C Hamano. # -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>]' + LONG_USAGE='git-rebase replaces <branch> with a new branch of the same name. When the --onto option is provided the new branch starts out with a HEAD equal to <newbase>, otherwise it is equal to <upstream> -- 1.5.4-rc5.GIT-dirty - 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
