Merge branch 'sb/submodule-config-doc-drop-path'
authorJunio C Hamano <gitster@pobox.com>
Mon, 17 Oct 2016 20:25:23 +0000 (13:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 17 Oct 2016 20:25:24 +0000 (13:25 -0700)
The "submodule.<name>.path" stored in .gitmodules is never copied
to .git/config and such a key in .git/config has no meaning, but
the documentation described it and submodule.<name>.url next to
each other as if both belong to .git/config. This has been fixed.

* sb/submodule-config-doc-drop-path:
documentation: improve submodule.<name>.{url, path} description

1  2 
Documentation/config.txt
Simple merge