Merge branch 'sb/glossary-submodule'
commitc491e9e4569b6304a5ce8d9f4c1602f21804d472
authorJunio C Hamano <gitster@pobox.com>
Thu, 11 Jun 2015 16:29:57 +0000 (11 09:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 11 Jun 2015 16:29:57 +0000 (11 09:29 -0700)
treed5c1879b1c3f2e23837f2f015ff02f0d940c9cec
parent7df5c978d579b83f23d8711b751ab2cd0f326af5
parente6a268c534df61f8ab96ce253e852f9109decb8f
Merge branch 'sb/glossary-submodule'

* sb/glossary-submodule:
  glossary: add "remote", "submodule", "superproject"