Johan Herland, 18.05.2009: > On Sunday 17 May 2009, Junio C Hamano wrote: > > [Will merge to "master" soon] > > > > * ph/submodule-rebase (Fri Apr 24 09:06:38 2009 +1000) 1 commit > > + git-submodule: add support for --rebase. > > [..] > > Now, my question should not stop this feature from going into 'master', > except for the fact that if we also want to support merge, we should > rename the associated config variable: > > Instead of > > submodule.<name>.rebase = true/false (false if unset) > > we should have something like > > submodule.<name>.resolve = checkout/rebase/merge (checkout if unset) At least this would be inconsistent with options like branch.<name>.merge and branch.<name>.rebase Markus -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html