[PATCH 4/7] support equal tree merges in interactive rebase

From

BLBernhard R. Link <brlink@debian.org>

Date

Nov 30, 2009, 14:44 UTC

Message-ID

<84bec3d6f3482d3cd6ef0a8734471deb69f3ff5a.1259524136.git.brlink@debian.org>

In-Reply-To

<cover.1259524136.git.brlink@debian.org>

---
 git-rebase--interactive.sh |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 0bd3bf7..3da9f3e 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -703,6 +703,7 @@ first and then run 'git rebase --continue' again."
 		fi
 		git rev-list $MERGES_OPTION --pretty=oneline --abbrev-commit \
 			--abbrev=7 --reverse --left-right --topo-order \
+			--first-equal-tree-only \
 			$REVISIONS | \
 			sed -n "s/^>//p" | while read shortsha1 rest
 		do