From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 25 Feb 2015 06:10:13 +0000 (-0800)
Subject: Merge branch 'jn/rerere-fail-on-auto-update-failure' into maint
X-Git-Tag: v2.3.1~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=74419c29df3f5c6b25bf0208222ddbf76b37acda;p=thirdparty%2Fgit.git

Merge branch 'jn/rerere-fail-on-auto-update-failure' into maint

"git rerere" (invoked internally from many mergy operations) did
not correctly signal errors when told to update the working tree
files and failed to do so for whatever reason.

* jn/rerere-fail-on-auto-update-failure:
  rerere: error out on autoupdate failure
---

74419c29df3f5c6b25bf0208222ddbf76b37acda