From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 May 2009 18:33:31 GMT
Subject: Re: git submodule update --merge
Message-ID: <7vmy91vxqc.fsf@alter.siamese.dyndns.org>
In-Reply-To: <200905251359.37619.johan@herland.net>

Johan Herland <johan@herland.net> writes:

> I haven't received any replies to my attempt to describe the context in 
> which "git submodule update --merge" is useful. A hint as to whether my 
> argument is valid, or just crap, would be nice.

FWIW, I didn't find "rebase makes sense but merge doesn't" argument very
convincing to begin with.  Because the configuration variable is about
"update" action, I agree it makes sense to do

>   submodule.<name>.update = checkout/rebase (checkout if unset)

from the UI standpoint.

I do not know what the sensible repertoire of options nor what the default
should be, though.  That's up to the submodule using people to sort out.