]> rtime.felk.cvut.cz Git - git.git/commitdiff
Merge branch 'jc/detached-head-doc' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Apr 2013 18:26:57 +0000 (11:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Apr 2013 18:26:57 +0000 (11:26 -0700)
* jc/detached-head-doc:
  glossary: extend "detached HEAD" description

Conflicts:
Documentation/glossary-content.txt

1  2 
Documentation/glossary-content.txt

Simple merge