From: jlehmann Date: Mon, 13 Sep 2010 16:57:49 +0000 (-0700) Subject: Migrated from home v28 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=166007d4f31ffdbccf8ea5f6d86eaec3246d220e;p=git-submod-enhancements.wiki.git Migrated from home v28 --- diff --git a/Home.textile b/Home.textile index ba6e8be..b9a1ec1 100644 --- a/Home.textile +++ b/Home.textile @@ -4,15 +4,14 @@ As Dscho put it, submodules are the "neglected ugly duckling" of git. Time to ch *Issues still to be tackled in this repo:* -* Add a config option to control when a submodule is considered dirty (in progress) +* Let fetch run recursively on submodules (in progress) * Showing that a submodule has a HEAD not on any branch in "git status" (in progress) -* gitk: Add popup menu for submodules to see the detailed history of changes * Check before a push in the superproject that all submodules HEADs are pushed -* Let stash work recursively on submodules +* 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 fetch run 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 -* Better support for merging and resolving merge conflicts of submodules (Heiko Voigt is working on the merge part) * Add means to specify which submodules shall be populated on clone * Add an "always-tip" mode @@ -29,4 +28,6 @@ As Dscho put it, submodules are the "neglected ugly duckling" of git. Time to ch * 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. \ No newline at end of file +** 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 +** Add config options to control when a submodule is considered dirty (both per submodule and by per repo or global configuration) +** Better support for merging of submodules (thanks to Heiko Voigt for writing that) \ No newline at end of file