Meta/Reintegrate: allow refs/merge-fix/* to supply evil-merge-fixups

diff --git a/Reintegrate b/Reintegrate
index 55e35b697902d8aac565765c2aa2b6483fcf2e47..b95f12cef3446449fa65b09596ae1e60b0d7d618 100755 (executable)
--- a/Reintegrate
+++ b/Reintegrate
@@ -38,7 +38,13 @@ do
        case "$eh" in
        "")
                echo >&2 "* $branch"
-               git merge "$branch" || accept_rerere || exit ;;
+               git merge "$branch" || accept_rerere || exit
+               if git show-ref -q --verify "refs/merge-fix/$branch"
+               then
+                       git cherry-pick --no-commit "refs/merge-fix/$branch" &&
+                       EDITOR=: git commit --amend -a
+               fi
+               ;;
        pick" "*)
                echo >&2 "* $eh"
                git cherry-pick "$branch" || exit ;;