Merge branch 'sb/glossary-submodule' into maint
commit6de4c808391ffff01185c093d6c46f2861f48862
authorJunio C Hamano <gitster@pobox.com>
Tue, 16 Jun 2015 21:33:51 +0000 (16 14:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 16 Jun 2015 21:33:51 +0000 (16 14:33 -0700)
treed81826d1015e8c5f7c735651a7f9bd20df2db772
parent6588f82ff6aa8ff7857304c10b18ab062e67bb52
parente6a268c534df61f8ab96ce253e852f9109decb8f
Merge branch 'sb/glossary-submodule' into maint

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