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

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Bernhard R. Link
Date: Monday, November 30, 2009 - 7:44 am

---
 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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
equal-tree-merges as way to make rebases fast-forward-able, Bernhard R. Link, (Mon Nov 30, 7:43 am)
[PATCH 1/7] add new command git equal-tree-marker, Bernhard R. Link, (Mon Nov 30, 7:43 am)
[PATCH 3/7] format-patch defaults to --first-equal-tree-only, Bernhard R. Link, (Mon Nov 30, 7:44 am)
[PATCH 4/7] support equal tree merges in interactive rebase, Bernhard R. Link, (Mon Nov 30, 7:44 am)
[PATCH 5/7] make rebase -m equal tree marker aware, Bernhard R. Link, (Mon Nov 30, 7:45 am)
Re: [PATCH 1/7] add new command git equal-tree-marker, Michael J Gruber, (Mon Nov 30, 8:36 am)
Re: equal-tree-merges as way to make rebases fast-forward-able, Johannes Schindelin, (Mon Nov 30, 10:19 am)
Re: equal-tree-merges as way to make rebases fast-forward-able, Bernhard R. Link, (Mon Nov 30, 11:55 am)