Merge branch 'ml/submodule-add-existing'
authorJunio C Hamano <gitster@pobox.com>
Sun, 9 Mar 2008 05:29:52 +0000 (21:29 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 9 Mar 2008 05:29:52 +0000 (21:29 -0800)
commit0ae496ccd85e121c01bddfdfc1a68aced04f79ff
treee9424a35724cc8fda37ee82b5d72c8e6e4910aa3
parent6e79a8858560a3a3e2b5e092a6cbdd5f3f1ad13b
parentd4264ca3233e206ea927bc94befda530683b5836
Merge branch 'ml/submodule-add-existing'

* ml/submodule-add-existing:
  git-submodule - Allow adding a submodule in-place