git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: faf723a 89ea903)
Merge branch 'jn/rerere-fail-on-auto-update-failure' into maint
authorJunio C Hamano <redacted>
Wed, 25 Feb 2015 06:10:13 +0000 (22:10 -0800)
committerJunio C Hamano <redacted>
Wed, 25 Feb 2015 06:10:13 +0000 (22:10 -0800)
commit74419c29df3f5c6b25bf0208222ddbf76b37acda
tree5f7f975adabcdd823ec0d156ba98e1ed800c6720tree | snapshot
parentfaf723a631aff822b4808c496c0970edb0ca2a99commit | diff
parent89ea90351dd32fbe384d0cf844640a9c55606f3bcommit | diff
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
rerere.c diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT