Hi, 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). Cc-ing Martin who carried out the parseoptification for advice. Patch left unsnipped below for reference. Thanks and hope that helps, Jonathan [...] > --- 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 > -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html