From: Jens Lehmann Date: Fri, 6 Dec 2013 08:49:55 +0000 (-0800) Subject: Updated Home (textile) X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c362e39fd6b042aa035bd092846bc318c202c266;p=git-submod-enhancements.wiki.git Updated Home (textile) --- diff --git a/Home.textile b/Home.textile index 81b35fd..8882dd0 100644 --- a/Home.textile +++ b/Home.textile @@ -13,6 +13,7 @@ As Dscho put it, submodules are the "neglected ugly duckling" of git. Time to ch * Add a git-config aware merge driver and make it the default for .gitmodules * Attempt a 3-way merge when @git mv@, @git rm@ or @git submodule add@ want to change a .gitmodules file which has unstaged changes * Add configuration options (global, per repo and per submodule) to set the default of @git push --recurse-submodules@ +* Add a tutorial explaining the different use cases and the configuration settings which suit them. * Add an option to @git submodule add@ to move the .git directory of a local repository to be added as submodule into the .git/modules directory of the superproject * Teach @grep@ the @--recursive@ option * Add means to specify which submodules shall be populated on clone (which I'd like to implement by teaching @git fetch@ to create submodule repos in .git/modules, recursive checkout will then do the rest)