Merge branch 'ta/glossary'
commitad77690fe400d91d3da97e16c07f1a8591b19b99
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Apr 2013 01:40:15 +0000 (21 18:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Apr 2013 01:40:15 +0000 (21 18:40 -0700)
tree6b6264e1b76b1afc438856473ca45ad052a99b0c
parentc6c4d616739b531b5689b78fbcb2c89d14e70a4f
parent57148ebb30fd7ed72acf7b3fc6f59d7cf2d94643
Merge branch 'ta/glossary'

* 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/config.txt
Documentation/git-rev-parse.txt
Documentation/glossary-content.txt
Documentation/pretty-formats.txt
Documentation/revisions.txt