* Add a git-config aware merge driver and make it the default for .gitmodules
* Attempt a 3-way merge when @git mv@, @git rm@ or @git submodule add@ 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 a git-config aware merge driver and make it the default for .gitmodules
* Attempt a 3-way merge when @git mv@, @git rm@ or @git submodule add@ 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@