Merge branch 'jn/rerere-fail-on-auto-update-failure' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 25 Feb 2015 06:10:13 +0000 (22:10 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 25 Feb 2015 06:10:13 +0000 (22:10 -0800)
commit74419c2...df3f5c6b25bf0208222ddbf76b37acda
tree5f7f975...dabcdd823ec0d156ba98e1ed800c6720copy hash to clipboard (tree)
parentfaf723a...31aff822b4808c496c0970edb0ca2a99copy hash to clipboard (diff)
parent89ea903...1dd32fbe384d0cf844640a9c55606f3bcopy hash to clipboard (diff)
rerere.c