From: jlehmann Date: Mon, 13 Sep 2010 16:57:50 +0000 (-0700) Subject: Migrated from home v29 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=25cddfa0c6387535de8118c257c2f2cebeccdb93;p=git-submod-enhancements.wiki.git Migrated from home v29 --- diff --git a/Home.textile b/Home.textile index b9a1ec1..63d221e 100644 --- a/Home.textile +++ b/Home.textile @@ -29,5 +29,5 @@ As Dscho put it, submodules are the "neglected ugly duckling" of git. Time to ch ** 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 config options to control when a submodule is considered dirty (both per submodule and by per repo or global configuration) +** 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