From c23ff3890864115123a1fc57d1f703318e6be2b2 Mon Sep 17 00:00:00 2001 From: jlehmann Date: Tue, 17 Jan 2012 13:45:53 -0800 Subject: [PATCH] Updated Home (textile) --- Home.textile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Home.textile b/Home.textile index 6f94dc5..692df1a 100644 --- a/Home.textile +++ b/Home.textile @@ -7,8 +7,6 @@ As Dscho put it, submodules are the "neglected ugly duckling" of git. Time to ch * Let am, bisect, checkout, checkout-index, cherry-pick, merge, pull, read-tree, rebase, reset & stash work recursively on submodules (in progress, including the 2011 GSoC work right now ...) * 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 (part of the 2011 GSoC project, patches provided by Frederik Gustafsson) -* Check before a push in the superproject that all submodules HEADs are pushed (part of the 2011 GSoC project, patches provided by Frederik Gustafsson) * 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 * Teach "git prune" the "--recurse-submodules" option (and maybe honour the same default and options "git fetch" uses) @@ -46,7 +44,7 @@ As Dscho put it, submodules are the "neglected ugly duckling" of git. Time to ch * Since git 1.7.5: ** fetch runs recursively on submodules by default when new commits have been recorded for them in the superproject * Since git 1.7.7: -** git push learned the --recurse-submodules=check option which errors out when trying to push a superproject commit where the submodule changes are not pushed +** git push learned the --recurse-submodules=check option which errors out when trying to push a superproject commit where the submodule changes are not pushed (part of Frederik Gustafsson's 2011 GSoC project) * Since git 1.7.7: ** The "update" option learned the value "none" which disables "submodule init" and "submodule update" -** The git directory of a newly cloned submodule is stored in the .git directory of the superproject, the submodules work tree contains only a gitfile. This is the first step towards recursive checkout, as it enables us to remove a submodule directory. \ No newline at end of file +** The git directory of a newly cloned submodule is stored in the .git directory of the superproject, the submodules work tree contains only a gitfile. This is the first step towards recursive checkout, as it enables us to remove a submodule directory (part of Frederik Gustafsson's 2011 GSoC project) \ No newline at end of file -- 2.26.2