diff --git a/Reintegrate b/Reintegrate index 2f03627926..653a13229c 100755 --- a/Reintegrate +++ b/Reintegrate @@ -53,6 +53,7 @@ no) : elif git show-ref -q --verify "refs/merge-fix/$branch" then + echo >&2 "Fixing up the merge" git cherry-pick --no-commit "refs/merge-fix/$branch" && EDITOR=: git commit --amend -a || exit fi