From: W. Trevor King <wking@tremily.us>
Date: Tue, 19 Feb 2013 09:35:24 GMT
Subject: Re: Re: [PATCH v3 8/9] user-manual: Flesh out uncommitted changes and submodule updates
Message-ID: <20130219093524.GB4024@odin.tremily.us>
In-Reply-To: <7vfw0ucoxk.fsf@alter.siamese.dyndns.org>

On Sun, Feb 17, 2013 at 06:53:59PM -0800, Junio C Hamano wrote:
> > +If you did not commit your submodule changes, the changes will *not*
> > +be silently overwritten.  Instead, you get the usual warning about not
> > +being able switch from a dirty branch.
> 
> The scenario this talks about is to commit changes in the
> superproject and then to run "submodule update".  I think the above
> clarification is still incomplete.  You may have committed in the
> submodule some changes but not all.
> 
> 	If you have uncommitted changes in your submodule working
> 	tree, "git submodule update" will not overwrite them.
> 	Instead...
> 
> would be an improvement, I think.

Will do in v4.

-- 
This email may be signed or encrypted with GnuPG (http://www.gnupg.org).
For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy