From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 14 Nov 2009 23:59:49 +0000 (-0800)
Subject: Meta/Reintegrate: allow refs/merge-fix/* to supply evil-merge-fixups
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bcab27041cdd36b396e744dda008974b578323b0;p=thirdparty%2Fgit.git

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

diff --git a/Reintegrate b/Reintegrate
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 ;;