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

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Apr 24, 2009, 06:41 UTC
Message-ID: <alpine.DEB.1.00.0904240839400.7393@intel-tinevez-2-302>
In-Reply-To: <20090423230637.GE2282@dingo.bne.redhat.com>

Hi,

On Fri, 24 Apr 2009, Peter Hutterer wrote:

Show 13 quoted lines

> 'git submodule update --rebase' rebases your local branch on top of what
> would have been checked out to a detached HEAD otherwise.
> 
> In some cases, detaching the HEAD when updating a submodule complicates
> the workflow to commit to this submodule (checkout master, rebase, then
> commit).  For submodules that require frequent updates but infrequent
> (if any) commits, a rebase can be executed directly by the git-submodule
> command, ensuring that the submodules stay on their respective branches.
> 
> git-config key: submodule.$name.rebase (bool)
> 
> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

Yes, I hereby give my sign-off ;-)

Show 18 quoted lines

> ---
> 
> > With this squashed in, I actually would not be too opposed to put this 
> > into 1.6.3, as it _is_ an improvement.
> > 
> > -- snipsnap --
> > [PATCH] To be squashed in
> > 
> > This does three things:
> > 
> > - add .gitmodules support for rebase,
> > - use --bool for the git config calls for type checking, and
> > - rename ambiguous t7404 to t7406.
> > 
> > Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> 
> Squashed in, thank you. One typo fixed in last testcase (does-not-mater ->
> does-not-matter).

I just blame it on the lousy Acer keyboard which cannot follow the speed of my fingers.

Thanks!

Junio, how about it? post 1.6.3 or not? It is a well contained change, with little chance of breaking something, but offers a more sensible workflow here.

Ciao, Dscho