Files
git/Documentation
Jeff King fdb4d27158 Merge branch 'jl/submodule-add-by-name'
If you remove a submodule, in order to keep the repository so that
"git checkout" to an older commit in the superproject history can
resurrect the submodule, the real repository will stay in $GIT_DIR
of the superproject.  A later "git submodule add $path" to add a
different submodule at the same path will fail.  Diagnose this case
a bit better, and if the user really wants to add an unrelated
submodule at the same path, give the "--name" option to give it a
place in $GIT_DIR of the superproject that does not conflict with
the original submodule.

* jl/submodule-add-by-name:
  submodule add: Fail when .git/modules/<name> already exists unless forced
  Teach "git submodule add" the --name option
2012-10-29 04:12:12 -04:00
..
2012-03-28 08:47:23 -07:00
2012-10-21 13:56:23 -07:00
2012-10-25 06:42:02 -04:00
2011-08-08 09:30:12 -07:00
2012-09-17 15:59:34 -07:00
2012-09-18 21:49:46 -07:00
2012-04-20 15:49:16 -07:00
2012-07-09 14:40:03 -07:00
2012-09-25 10:39:52 -07:00
2012-09-18 21:49:50 -07:00
2012-06-19 11:35:19 -07:00
2012-09-11 11:23:54 -07:00
2012-08-06 15:34:20 -07:00
2011-12-12 11:52:31 -08:00
2011-09-06 11:42:12 -07:00
2011-05-19 10:55:54 -07:00
2011-03-11 10:59:16 -05:00
2012-10-21 13:56:23 -07:00
2010-07-05 13:39:02 -07:00
2012-06-19 11:35:19 -07:00