From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 20 Apr 2009 09:55:54 GMT
Subject: Re: [PATCH/RESEND] git-submodule: add support for --rebase.
Message-ID: <alpine.DEB.1.00.0904201152360.6955@intel-tinevez-2-302>
In-Reply-To: <20090419233051.GA17946@dingo.bne.redhat.com>

Hi,

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).

> Original thread died after discussions about the wording in the man 
> page, last reviewer comment being:
>
> "You can really rebase only onto a commit.  And the index is not a 
> commit, so I do not like the wording (not even in the rebase man page).
> 
> But let's see what other reviewers say... :-)"

I take this as a sign that other reviewers (if any) agree with me ;-)

> 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?

So I'd prefer a repost with rewrapped commit message and reworded man page 
modifications.

However, I could imagine that Junio does not want to take this patch right 
now, as we are deep in -rc mode for the upcoming 1.6.3.  Junio?

Ciao,
Dscho