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
@@ -38,7 +38,13 @@ do
38
case "$eh" in
39
"")
40
echo >&2 "* $branch"
41
- git merge "$branch" || accept_rerere || exit ;;
41
+ git merge "$branch" || accept_rerere || exit
42
+ if git show-ref -q --verify "refs/merge-fix/$branch"
43
+ then
44
+ git cherry-pick --no-commit "refs/merge-fix/$branch" &&
45
+ EDITOR=: git commit --amend -a
46
+ fi
47
+ ;;
48
pick" "*)
49
echo >&2 "* $eh"
50
git cherry-pick "$branch" || exit ;;