Update git-rebase to create MERGE_HEAD on failed preserve merge