From: jlehmann Date: Wed, 29 Sep 2010 20:18:28 +0000 (-0700) Subject: Updated Home (textile) X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=805c70d7e67abc6edc33ad0b06cf04283dc835d1;p=git-submod-enhancements.wiki.git Updated Home (textile) --- diff --git a/Home.textile b/Home.textile index 63d221e..0d1cf3c 100644 --- a/Home.textile +++ b/Home.textile @@ -5,14 +5,14 @@ As Dscho put it, submodules are the "neglected ugly duckling" of git. Time to ch *Issues still to be tackled in this repo:* * Let fetch run recursively on submodules (in progress) -* Showing that a submodule has a HEAD not on any branch in "git status" (in progress) +* Let checkout, checkout-index, read-tree & reset work recursively on submodules (in progress) +* Add means to specify which submodules shall be populated on clone * 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" * gitk: Add popup menu for submodules to see the detailed history of changes -* Let checkout, checkout-index, read-tree & reset work recursively on submodules (in progress) * Let stash work recursively on submodules * Better support for displaying merge conflicts of submodules * git gui: Add submodule menu for adding and fetching submodules -* Add means to specify which submodules shall be populated on clone * Add an "always-tip" mode *Issues already solved and merged into Junio's Repo:* @@ -27,7 +27,7 @@ As Dscho put it, submodules are the "neglected ugly duckling" of git. Time to ch ** Show the reason why working directories of submodules are dirty (untracked content and/or modified content) in superproject * Since git 1.7.2: ** Add parameters to the "--ignore-submodules" option for "git diff" and "git status" to control when a submodule is considered dirty -* Expected in git 1.7.3: -** Add the "ignore" config option for the default behaviour of "--ignore-submodules". Both .git/config and .gitmodules are parsed for this option, the value set in .git/config. will override that from .gitmodules +* Since git 1.7.3: +** Add the "ignore" config option for the default behaviour of "git diff" and "git status". Both .git/config and .gitmodules are parsed for this option, the value set in .git/config. will override that from .gitmodules ** Add a global config option to control when a submodule is considered dirty (written by Dscho) ** Better support for merging of submodules (thanks to Heiko Voigt for writing that) \ No newline at end of file