Meta/Reintegrate: allow refs/merge-fix/* to supply evil-merge-fixups
Junio C Hamano committed
Nov 14, 2009 at 15:59 UTC
bcab27041cdd36b396e744dda008974b578323b0
1 file changed
+7
-1
Reintegrate
+7
-1
index 55e35b6979..b95f12cef3 100755
--- 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 ;;