From: jlehmann Date: Sun, 15 May 2011 13:12:55 +0000 (-0700) Subject: Updated Home (textile) X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e1b285340249e7a38c7b23a809b028773de6a599;p=git-submod-enhancements.wiki.git Updated Home (textile) --- diff --git a/Home.textile b/Home.textile index 7bfc39a..f605d61 100644 --- a/Home.textile +++ b/Home.textile @@ -4,14 +4,13 @@ As Dscho put it, submodules are the "neglected ugly duckling" of git. Time to ch *Issues still to be tackled in this repo:* -* Let checkout, checkout-index, read-tree & reset work recursively on submodules (in progress) +* Let am, checkout, checkout-index, cherry-pick, merge, pull, read-tree, rebase, reset & stash work recursively on submodules (in progress) * Teach grep the --recursive option (in progress thanks to Chris Packham) * Add means to specify which submodules shall be populated on clone -* Move the submodules git directories into the superproject's .git so that submodules can be created and deleted -* Check before a push in the superproject that all submodules HEADs are pushed -* Showing that a submodule has a HEAD not on any branch in "git status" +* Move the submodules git directories into the superproject's .git so that submodules can be created and deleted (part of the 2011 GSoC project) +* Check before a push in the superproject that all submodules HEADs are pushed (part of the 2011 GSoC project) +* Showing that a submodule has a HEAD not on any branch in "git status" (part of the 2011 GSoC project) * gitk: Add popup menu for submodules to see the detailed history of changes -* Let stash work recursively on submodules * Teach "git prune" the "--recurse-submodules" option (and maybe honour the same default and options "git fetch" uses) * Better support for displaying merge conflicts of submodules * git gui: Add submodule menu for adding and fetching submodules @@ -42,5 +41,5 @@ As Dscho put it, submodules are the "neglected ugly duckling" of git. Time to ch ** Better support for merging of submodules (thanks to Heiko Voigt for writing that) * Since git 1.7.4: ** Recursive fetching of submodules can be enabled via command line option or configuration. -* Expected in git 1.7.5: +* Since git 1.7.5: ** fetch runs recursively on submodules by default when new commits have been recorded for them in the superproject \ No newline at end of file