rebase: remove obsolete and unused LONG_USAGE which breaks xgettext
Since there is a modern OPTIONS_SPEC variable in use in this script, the obsolete USAGE and LONG_USAGE variables are no longer used. Remove them. In addition, the obsolete LONG_USAGE variable has the following message in it: A'\''--B'\''--C'\'' And such complex LONG_USAGE message will break xgettext when extracting l10n messages (but if single quotes are removed from the message, xgettext works fine on 'git-rebase.sh'). Signed-off-by: Jiang Xin <worldhello.net@gmail.com> Reviewed-by: Stefano Lattarini <stefano.lattarini@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jiang Xin committed
Jul 25, 2012 at 22:53 UTC
c021fbf615f5cbd29ad4d9349bd2c36347655f3b
1 file changed
-25
git-rebase.sh
-25
@@ -3,31 +3,6 @@
3
# Copyright (c) 2005 Junio C Hamano.
4
#
5
6
-USAGE='[--interactive | -i] [--exec | -x <cmd>] [-v] [--force-rebase | -f]
7
- [--no-ff] [--onto <newbase>] [<upstream>|--root] [<branch>] [--quiet | -q]'
8
-LONG_USAGE='git-rebase replaces <branch> with a new branch of the
9
-same name. When the --onto option is provided the new branch starts
10
-out with a HEAD equal to <newbase>, otherwise it is equal to <upstream>
11
-It then attempts to create a new commit for each commit from the original
12
-<branch> that does not exist in the <upstream> branch.
13
-
14
-It is possible that a merge failure will prevent this process from being
15
-completely automatic. You will have to resolve any such merge failure
16
-and run git rebase --continue. Another option is to bypass the commit
17
-that caused the merge failure with git rebase --skip. To check out the
18
-original <branch> and remove the .git/rebase-apply working files, use the
19
-command git rebase --abort instead.
20
-
21
-Note that if <branch> is not specified on the command line, the
22
-currently checked out branch is used.
23
-
24
-Example: git-rebase master~1 topic
25
-
26
- A---B---C topic A'\''--B'\''--C'\'' topic
27
- / --> /
28
- D---E---F---G master D---E---F---G master
29
-'
30
-
6
SUBDIRECTORY_OK=Yes
7
OPTIONS_KEEPDASHDASH=
8
OPTIONS_SPEC="\