> I do believe this bug may actually be fixed in master, by 93406a282f > ("rerere: fix crash with files rerere can't handle", 2018-08-05). Do > you by any chance remember if you committed a file that contained > conflict markers during the rebase at some point? I might have, but I am not 100% sure. > The problem I found at the time looked the same as your backtrace > above in any case. Thanks for checking. I will keep the core dump and report back if it ever happens again.