]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'jl/submodule-add-relurl-wo-upstream'
authorJunio C Hamano <gitster@pobox.com>
Fri, 22 Jul 2011 21:24:35 +0000 (14:24 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 22 Jul 2011 21:24:35 +0000 (14:24 -0700)
commitc56dce3b811400e73e7b68464cf229aa0edb9d8f
treeda27f15acf73ca6f932c32d2e71a40e73c853e30
parented16d0dbf11128e1f92b39a373a83442fa6d5051
parentf22a17e8da25a043950a13f11035930922bb86e7
Merge branch 'jl/submodule-add-relurl-wo-upstream'

* 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