diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-02-11 13:41:44 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-02-11 13:41:45 -0800 |
| commit | 76c6747b7e0a67416c1d88bf50440436397abd3f (patch) | |
| tree | 77a38d7b1e5762b57baaaf687a4eb1a56e4b7cbb /convert.c | |
| parent | 092c4be7f5d691809913eb83a2360f035c67ab06 (diff) | |
| parent | 89ea90351dd32fbe384d0cf844640a9c55606f3b (diff) | |
| download | git-76c6747b7e0a67416c1d88bf50440436397abd3f.tar.gz | |
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
Diffstat (limited to 'convert.c')
0 files changed, 0 insertions, 0 deletions