Re: [PATCH v3 4/7] Remove obsolete LONG_USAGE which breaks xgettext
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jul 24, 2012, 19:07 UTC
- Message-ID
- <7vpq7lf05k.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <20120724180808.GG2939@burratino>
Jonathan Nieder <jrnieder@gmail.com> writes:
Show 9 quoted lines
> Jiang Xin wrote: > >> The obsolete LONG_USAGE variable > [...] > > It's a shame to lose the information that was in the LONG_USAGE > message, though. Maybe it could be incorporated into the OPTIONS_SPEC > before the opening "--", or maybe it could be used to clarify the > description in git-rebase(1).
I personally think the original long-usage was overkill to be part of the help text, and I am happy to see it go.
I wouldn't mind seeing it incorporated in the documentation if there is something in there that is missing, but I suspect that the first part of the DESCRIPTION should be sufficiently clear already.
Show 38 quoted lines
> [...] >> --- a/git-rebase.sh >> +++ b/git-rebase.sh >> @@ -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 | -q]' >> -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 >> -' >> - >> SUBDIRECTORY_OK=Yes >> OPTIONS_KEEPDASHDASH= >> OPTIONS_SPEC="\ >> -- >> 1.7.12.rc0.17.gcb766d3 >>