Merge branch 'sb/submodule-add-force'
authorJunio C Hamano <gitster@pobox.com>
Thu, 2 Feb 2017 21:36:54 +0000 (13:36 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 2 Feb 2017 21:36:54 +0000 (13:36 -0800)
"git submodule add" used to be confused and refused to add a
locally created repository; users can now use "--force" option
to add them.

* sb/submodule-add-force:
submodule add: extend force flag to add existing repos

1  2 
git-submodule.sh
Simple merge