The obsolete LONG_USAGE variable has the following message in it:


And such complex LONG_USAGE message will breaks xgettext when extract
l10n messages. But if remove single quotes from the message, xgettext
works fine on ''.

Since there is a mordern OPTIONS_SPEC variable in use in this script,
it's safe to remove the obsolte USAGE and LONG_USAGE variables.

Signed-off-by: Jiang Xin <>
--- | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/ b/
index 640af..02c63 100755
--- a/
+++ b/
@@ -3,31 +3,6 @@
 # Copyright (c) 2005 Junio C Hamano.
-USAGE='[--interactive | -i] [--exec | -x <cmd>] [-v] [--force-rebase | -f]
-       [--no-ff] [--onto <newbase>] [<upstream>|--root] [<branch>] [--quiet | 
-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>
-It then attempts to create a new commit for each commit from the original
-<branch> that does not exist in the <upstream> 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 <branch> and remove the .git/rebase-apply working files, use the
-command git rebase --abort instead.
-Note that if <branch> 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

To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to
More majordomo info at

Reply via email to