Merge branch 'jk/am-rerere-lock-fix'
authorJunio C Hamano <gitster@pobox.com>
Thu, 3 Sep 2015 21:14:01 +0000 (14:14 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 3 Sep 2015 21:14:01 +0000 (14:14 -0700)
commit7662973...a38e39f2766a4403209189f263c914a3
tree38d64a6...067ae465a32e50e3b998c7d84c29c2fccopy hash to clipboard (tree)
parent16ffa64...3e279a9b3b63d7a2bebeb07833506010copy hash to clipboard (diff)
parent9dd330e...cad6ce11557acb18f35136c549d8ac1bcopy hash to clipboard (diff)