Migrated from home v24

diff --git a/Home.textile b/Home.textile
index 8203017501bbd747df274d1fd9f323c848516e4b..dfe96b24fd1288d35f8c44eaee3beff881c97a42 100644 (file)
--- a/Home.textile
+++ b/Home.textile
@@ -4,6 +4,7 @@ As Dscho put it, submodules are the "neglected ugly duckling" of git. Time to ch
 
 *Issues still to be tackled in this repo:*
 
+* Add an option to "git diff" and "git status" and a config option to control when a submodule is considered dirty (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
@@ -11,7 +12,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 (Heiko Voigt is working on that)
+* 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