Merge branch 'maint'
commitbb79a827a2bd4987b6def75a534635d75478cf4d
authorJunio C Hamano <gitster@pobox.com>
Sun, 17 Mar 2013 07:11:11 +0000 (17 00:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 17 Mar 2013 07:11:11 +0000 (17 00:11 -0700)
tree404e17e248ecc23fbab685ff4151b08d0d411f82
parent239222f587ed06f96d90dd71c66d80a2b1e3dc9f
parent47e329ef7c46de8ccdc8c4e40333579264a83c21
Merge branch 'maint'

* maint:
  rev-parse: clarify documentation of $name@{upstream} syntax
  sha1_name: pass object name length to diagnose_invalid_sha1_path()
  Makefile: keep LIB_H entries together and sorted
Documentation/revisions.txt
Makefile