On Mon, Nov 03 2014, Junio C Hamano wrote: > I did a bit more digging of the history, and came up with this, > which would be with a clearer and fairer description. Also to > clarify, I spelled what Michal's "This" meant to refer to. > > -- >8 -- > From: Michal Sojka <sojk...@fel.cvut.cz> > Date: Mon, 3 Nov 2014 11:09:51 +0100 > Subject: [PATCH] submodule: clarify documentation for update subcommand > > e6a1c43a (document submdule.$name.update=none option for gitmodules, > 2012-05-10) meant to say "Unlike the case where your .update > configuration is set to either 'rebase' or 'merge', when it is set > to 'none', the tip of the submodule would never move. You can use > the --checkout option if you want the contents of the submodule to > be updated to some other commit." > > But the resulting text made it sound as if using "--checkout" would > have no effect when .update configuration is set to 'rebase' or > 'merge', which was misleading. In fact, with the "--checkout" > option, the tip of the submodule moves to the exact commit that is > recorded in the superproject tree, regardless of .update > configuration.
This is much better description than I was able to put together. Thanks. I also agree with Jens that mentioning --merge and --rebase is worthwhile. -Michal -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
