From: Jens Lehmann Date: Mon, 3 Jun 2013 21:22:47 +0000 (-0700) Subject: Updated Home (textile) X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=616ac8b6a8f505f251edd6fde57f231c9a70c2a6;p=git-submod-enhancements.wiki.git Updated Home (textile) --- diff --git a/Home.textile b/Home.textile index 185ff51..b835171 100644 --- a/Home.textile +++ b/Home.textile @@ -13,7 +13,7 @@ As Dscho put it, submodules are the "neglected ugly duckling" of git. Time to ch * Add functionality to move the .git directory of a submodule into the .git/modules directory of the superproject (either by adding a new @git submodule@ command or by providing a script in contrib/) * Add a git-config aware merge driver and make it the default for .gitmodules -* Attempt a 3-way merge when @git mv@ or @git rm@ want to change a .gitmodules file which has unstaged changes +* 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 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