Merge branch 'maint'
commitaa576e6b47d8e20d0d56d0e9f9fc2ecce5bae1e1
authorJunio C Hamano <junkio@cox.net>
Thu, 22 Mar 2007 10:05:25 +0000 (22 03:05 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 22 Mar 2007 10:05:25 +0000 (22 03:05 -0700)
tree0e0149b07e2820d7518c514a316c24a0c6b9879e
parent605fac8b5bd6d4a2ca817631e2c56ba2d0a1ed91
parent979ea5856cddace7223ddd715a448dbe49fcb290
Merge branch 'maint'

* maint:
  Documentation/pack-format.txt: Clear up description of types.
  fix typo in git-am manpage