From: Jiang Xin Date: Sun, 22 Jul 2012 01:26:08 GMT Subject: [PATCH v2 4/7] Remove obsolete LONG_USAGE which breaks xgettext Message-ID: <16d740e2d6e38e1ce8f3770f506623068b1cf309.1342920089.git.worldhello.net@gmail.com> In-Reply-To: The obsolete LONG_USAGE variable has the following message in it: A'\''--B'\''--C'\'' And such complex LONG_USAGE message will breaks xgettext when extracting l10n messages. But if single quotes are removed from the message, xgettext works fine on 'git-rebase.sh'. Since there is a modern OPTIONS_SPEC variable in use in this script, it's safe to remove the obsolete USAGE and LONG_USAGE variables. Signed-off-by: Jiang Xin Signed-off-by: Stefano Lattarini --- git-rebase.sh | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/git-rebase.sh b/git-rebase.sh index 640af..02c63 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -3,31 +3,6 @@ # Copyright (c) 2005 Junio C Hamano. # -USAGE='[--interactive | -i] [--exec | -x ] [-v] [--force-rebase | -f] - [--no-ff] [--onto ] [|--root] [] [--quiet | -q]' -LONG_USAGE='git-rebase replaces with a new branch of the -same name. When the --onto option is provided the new branch starts -out with a HEAD equal to , otherwise it is equal to -It then attempts to create a new commit for each commit from the original - that does not exist in the branch. - -It is possible that a merge failure will prevent this process from being -completely automatic. You will have to resolve any such merge failure -and run git rebase --continue. Another option is to bypass the commit -that caused the merge failure with git rebase --skip. To check out the -original and remove the .git/rebase-apply working files, use the -command git rebase --abort instead. - -Note that if is not specified on the command line, the -currently checked out branch is used. - -Example: git-rebase master~1 topic - - A---B---C topic A'\''--B'\''--C'\'' topic - / --> / - D---E---F---G master D---E---F---G master -' - SUBDIRECTORY_OK=Yes OPTIONS_KEEPDASHDASH= OPTIONS_SPEC="\ -- 1.7.11.2.259.g37fc0e1