From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 11 Feb 2015 21:41:44 +0000 (-0800)
Subject: Merge branch 'jn/rerere-fail-on-auto-update-failure'
X-Git-Tag: v2.4.0-rc0~138
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=76c6747b7e0a67416c1d88bf50440436397abd3f;p=thirdparty%2Fgit.git

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

"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
---

76c6747b7e0a67416c1d88bf50440436397abd3f