Merge branch 'jl/submodule-add-relurl-wo-upstream' into maint
commitf4af7f19639457d71c4e9b53892b937468824cac
authorJunio C Hamano <gitster@pobox.com>
Tue, 16 Aug 2011 19:41:13 +0000 (16 12:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 16 Aug 2011 19:41:13 +0000 (16 12:41 -0700)
tree7da4b356951fc0be359dc145939878e941794c6f
parent2a764974271aa36101b241fef8e2945db9b418a5
parentf22a17e8da25a043950a13f11035930922bb86e7
Merge branch 'jl/submodule-add-relurl-wo-upstream' into maint

* jl/submodule-add-relurl-wo-upstream:
  submodule add: clean up duplicated code
  submodule add: allow relative repository path even when no url is set
  submodule add: test failure when url is not configured in superproject

Conflicts:
git-submodule.sh
Documentation/git-submodule.txt
git-submodule.sh
t/t7400-submodule-basic.sh