Re: [PATCH/RESEND] git-submodule: add support for --rebase.

> On Mon, Apr 20, 2009 at 11:55:54AM +0200, Johannes Schindelin wrote:
> > On Mon, 20 Apr 2009, Peter Hutterer wrote:
> > 
> > > 'git submodule update --rebase' rebases your local branch on top of what would
> > 
> > This line is so long that it got wrapped in my mail program.  But it is 
> > even worse: we would like to show this in an 80-column display with a 
> > 4-space indent, so it would be nice if you could rewrap to 76 columns (I 
> > even use 72 columns, because it looks nicer).
> 
> amended to 72 cols, see below.

> > > I'm still unsure about whether to change the wording (it currently uses 
> > > the same terms as git-rebase and the rest of the git-submodule man 
> > > page). Please let me know what to do to get this patch done.
> > 
> > AFAIR I gave an alternative wording, am I wrong?
> 
> yes, but tbh. I found it a bit confusing. Your suggestion was
> 
>        "Instead of detaching the HEAD to the revision committed in the
>         superproject, rebase the current branch onto that revision."
> 
> How about this one, basically the same but split up in two sentences:
> 
> +--rebase::
> +	This option is only valid for the update command.
> +	Rebase the current branch onto the commit recorded in the
> +	superproject. If this option is given, the submodule's HEAD will not
> +	be detached. If a a merge failure prevents this process, you will have
> +	to resolve these failures with linkgit:git-rebase[1].