From: Nicolas Morey-Chaisemartin <devel-git@morey-chaisemartin.com>
Date: Tue, 22 Mar 2011 06:28:04 GMT
Subject: Re: [PATCH] git-submodule: Remove duplicate entries during merge with conflict
Message-ID: <4D884174.6070700@morey-chaisemartin.com>
In-Reply-To: <4D87CAC4.2010001@web.de>

On 21/03/2011 23:01, Jens Lehmann wrote:
> Hmm, I'm not sure if I fully understand your use case. Maybe being able
> to tell pull to run a "git merge <sha1-from-upstream>" in submodules
> where the superproject's merge produced conflicts would help you?
> 

In short yes. And if it could be recursive (if a conflicting submodules has conflicting submodules) that would be great !
And yes git-merge is probably a better place to do something like that than git submodule update.

> That is a good argument against '*'. I don't have strong feelings about
> that, I just came up with '*' because "git submodule status" already uses
> '-' and '+' in it's output. But anyways, 'U' is fine for me too.
> 

OK. I'll integrate that with the patch Junio proposed then.

Nicolas