Merge branch 'jc/detached-head-doc' into maint
commitbe9d07f520ef10359202492652ee7a6001f7100b
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Apr 2013 18:26:57 +0000 (22 11:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Apr 2013 18:26:57 +0000 (22 11:26 -0700)
treed51b896109cf6e980a4be6ae382124ad4e9d3f37
parent4fe3ed130201a95212dd18cb3bef104d44ed49c4
parent1d77d249f9b0605ed21ca751c5dfb8550efcdfa3
Merge branch 'jc/detached-head-doc' into maint

* jc/detached-head-doc:
  glossary: extend "detached HEAD" description

Conflicts:
Documentation/glossary-content.txt
Documentation/glossary-content.txt