Merge branch 'ta/glossary' into maint
commit76f9bc9f53a7bc72950d8ee88e88bf41903fab74
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Apr 2013 18:26:58 +0000 (22 11:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Apr 2013 18:26:58 +0000 (22 11:26 -0700)
tree739bf070864f02f2f6ae94562cfa6f459b863ed3
parent56303b8bb5b62ee02c8cc6c953fd572abf6ee53c
parent57148ebb30fd7ed72acf7b3fc6f59d7cf2d94643
Merge branch 'ta/glossary' into maint

* ta/glossary:
  glossary: improve definitions of refspec and pathspec
  The name of the hash function is "SHA-1", not "SHA1"
  glossary: improve description of SHA-1 related topics
  glossary: remove outdated/misleading/irrelevant entries
Documentation/glossary-content.txt