git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 092c4be 89ea903)
Merge branch 'jn/rerere-fail-on-auto-update-failure'
authorJunio C Hamano <redacted>
Wed, 11 Feb 2015 21:41:44 +0000 (13:41 -0800)
committerJunio C Hamano <redacted>
Wed, 11 Feb 2015 21:41:45 +0000 (13:41 -0800)
commit76c6747b7e0a67416c1d88bf50440436397abd3f
tree77a38d7b1e5762b57baaaf687a4eb1a56e4b7cbbtree | snapshot
parent092c4be7f5d691809913eb83a2360f035c67ab06commit | diff
parent89ea90351dd32fbe384d0cf844640a9c55606f3bcommit | diff
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
rerere.c diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT