From 3b239b33b94b4366c2c0da2a776837cdd91b7589 Mon Sep 17 00:00:00 2001 From: Jens Lehmann Date: Mon, 3 Jun 2013 13:59:07 -0700 Subject: [PATCH] Updated Home (textile) --- Home.textile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Home.textile b/Home.textile index 8b1aaf4..185ff51 100644 --- a/Home.textile +++ b/Home.textile @@ -9,14 +9,16 @@ As Dscho put it, submodules are the "neglected ugly duckling" of git. Time to ch * Teach @git fetch@ to also fetch commits for submodule not currently in the work tree into .git/modules/ * Make the @git submodule@ script run in non top-level directories too -*Issues still to be tackled in this repo* +*Issues still to be tackled* * Add functionality to move the .git directory of a submodule into the .git/modules directory of the superproject (either by adding a new @git submodule@ command or by providing a script in contrib/) +* Add a git-config aware merge driver and make it the default for .gitmodules +* Attempt a 3-way merge when @git mv@ or @git rm@ want to change a .gitmodules file which has unstaged changes * Add configuration options (global, per repo and per submodule) to set the default of @git push --recurse-submodules@ * Add an option to @git submodule add@ to move the .git directory of a local repository to be added as submodule into the .git/modules directory of the superproject * Teach @grep@ the @--recursive@ option * Add means to specify which submodules shall be populated on clone (which I'd like to implement by teaching @git fetch@ to create submodule repos in .git/modules, recursive checkout will then do the rest) -* Showing that a submodule has a HEAD not on any branch in @git status@ +* Showing that a submodule has a HEAD not on any branch in the @git status@ of the superproject * @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) * Better support for displaying merge conflicts of submodules @@ -29,7 +31,6 @@ In the long run, git-submodule.sh should be converted to a rather simple wrapper *Submodule related bugs to fix* -* @git fetch@ doesn't fetch referenced commits after a submodule rename * Cherry picking across submodule creation fails even if the cherry pick doesn't touch any file in the submodules path * @git submodule add@ doesn't record the URL in .git/config when the submodule path doesn't exist. -- 2.26.2