[PATCH] git-rebase.sh: Update USAGE string (No. 1)
- From
Jari Aalto <jari.aalto@cante.net>
- Date
- Feb 3, 2008, 23:33 UTC
- Message-ID
- <ir15399p.fsf@blue.sea.net>
- In-Reply-To
- <prvd3i9e.fsf@blue.sea.net>
Present the options in -s|--long (short, long) order. Mention merge and new whitespace option.
ed-off-by: Jari Aalto <jari.aalto AT cante.net> --- *********************************************************************** Reworked patch (No. 1)
[Jakub Narebski] > or break synopsis into lines 80-column lines max.
***********************************************************************
git-rebase.sh | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/git-rebase.sh b/git-rebase.sh index bdcea0e..6805742 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 -- Welcome to FOSS revolution: we fix and modify until it shines