From: jlehmann Date: Mon, 13 Sep 2010 16:57:43 +0000 (-0700) Subject: Migrated from home v23 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=642fc8ef68e6f12e8ca929bec101abc0a0a9e7a0;p=git-submod-enhancements.wiki.git Migrated from home v23 --- diff --git a/Home.textile b/Home.textile index b171b7e..8203017 100644 --- a/Home.textile +++ b/Home.textile @@ -11,7 +11,7 @@ As Dscho put it, submodules are the "neglected ugly duckling" of git. Time to ch * Let checkout, checkout-index, read-tree & reset work recursively on submodules (in progress) * Let fetch run recursively on submodules (in progress) * git gui: Add submodule menu for adding and fetching submodules -* Better support for merging and resolving merge conflicts of submodules +* Better support for merging and resolving merge conflicts of submodules (Heiko Voigt is working on that) * Add means to specify which submodules shall be populated on clone * Add an "always-tip" mode