Migrated from home v29

[git-submod-enhancements.wiki.git] / Home.textile

diff --git a/Home.textile b/Home.textile
index 9b22cc55075b7d190c1d274d68ea3afde286e5bc..63d221e4385f0c4c90ce1da6c57eb716705aefd1 100644 (file)
--- a/Home.textile
+++ b/Home.textile
@@ -4,21 +4,30 @@ As Dscho put it, submodules are the "neglected ugly duckling" of git. Time to ch
 
 *Issues still to be tackled in this repo:*
 
-* git gui: Add popup menu for submodule diffs (Shawn merged it on Jan 23th 2010, still has to be merged into Junios repo though)
-* Showing dirty working directories of submodules in superproject (basic support seems to make it into 1.7.0)
+* 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
+* 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
-* Let checkout & reset work recursively on submodules
-* Let fetch run recursively on submodules
+* Better support for displaying merge conflicts of submodules
 * git gui: Add submodule menu for adding and fetching submodules
-* Collecting hooks useful for submodules (this may be obsolete when submodules become a first class citizen of git)
-* Better support for merging and resolving merge conflicts of 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:*
 
-* since git 1.6.6: New --submodule option to "git diff" (many thanks to Dscho for writing the core part!)
-* since git 1.6.6: Display of submodule summary in git gui and gitk
-* expected for 1.7.0: "git status" and "git diff*" show submodules with untracked or modified files in their work tree as modified
\ No newline at end of file
+* Since git 1.6.6:
+** New --submodule option to "git diff" (many thanks to Dscho for writing the core part!)
+** Display of submodule summaries instead of plain hashes in git gui and gitk
+* Since git 1.7.0:
+** "git status" and "git diff*" show submodules with untracked or modified files in their work tree as "dirty"
+** git gui: New popup menu for submodule diffs
+* Since git 1.7.1:
+** 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
+** 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