Merge branch 'jn/rerere-fail-on-auto-update-failure'
authorJunio C Hamano <gitster@pobox.com>
Wed, 11 Feb 2015 21:41:44 +0000 (13:41 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 Feb 2015 21:41:45 +0000 (13:41 -0800)
commit76c6747...7e0a67416c1d88bf50440436397abd3f
tree77a38d7...1e5762b57baaaf687a4eb1a56e4b7cbbcopy hash to clipboard (tree)
parent092c4be...f5d691809913eb83a2360f035c67ab06copy hash to clipboard (diff)
parent89ea903...1dd32fbe384d0cf844640a9c55606f3bcopy hash to clipboard (diff)
rerere.c