Git refusing to merge unrelated histories on rebase