Merge branch 'jk/type-from-string-gently' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 13 May 2015 21:05:54 +0000 (14:05 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 13 May 2015 21:05:54 +0000 (14:05 -0700)
commitc1c4a87...bb70b6f46550ab370bba320a3a5dda70
tree6b39e41...dc0505cb07bd0c3f76fdc4fc46e098b9copy hash to clipboard (tree)
parent21b56b9...590e68fde07abbba7676c91cd883031bcopy hash to clipboard (diff)
parentb7994af...f92e6cf150544aebe3c3fc526faaf2c3copy hash to clipboard (diff)
object.c