From 366cd1a83ee42406efac760ea32334d16afb718c Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 22 Mar 2011 13:41:07 +0100
Subject: [PATCH] rebasing-merge: look harder for previous rebasing merge

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 share/msysGit/rebasing-merge.sh | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/share/msysGit/rebasing-merge.sh b/share/msysGit/rebasing-merge.sh
index 46dbc7b6..46ba86ea 100755
--- a/share/msysGit/rebasing-merge.sh
+++ b/share/msysGit/rebasing-merge.sh
@@ -39,8 +39,17 @@ esac
 
 rm -f "$TODO_EXTRA"
 
-MERGE=$(git rev-list --parents $TO.. | sed -n 's/ .* .*//p' | head -n 1)
-if test "$(git rev-parse $MERGE:)" = "$(git rev-parse "$MERGE^:")"
+MERGE=
+for commit in $(git rev-list --parents $TO.. | sed -n 's/ .* .*//p')
+do
+	if test "$(git rev-parse $commit:)" = "$(git rev-parse "$commit^:")"
+	then
+		MERGE=$commit
+		break
+	fi
+done
+
+if test -n "$MERGE"
 then
 	ORIG_HEAD=$(git rev-parse HEAD) &&
 	# Find prior merges to $TO
-- 
2.11.4.GIT