[PATCH 5/7] make rebase -m equal tree marker aware
From: Bernhard R. Link <hidden>
Date: 2016-06-15 22:47:48
Subsystem:
the rest · Maintainer:
Linus Torvalds
--- git-rebase.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/git-rebase.sh b/git-rebase.sh
index b121f45..391f6d6 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh@@ -539,7 +539,7 @@ echo "$head_name" > "$dotest/head-name" echo "$GIT_QUIET" > "$dotest/quiet" msgnum=0 -for cmt in `git rev-list --reverse --no-merges "$revisions"` +for cmt in `git rev-list --reverse --first-equal-tree-only --no-merges "$revisions"` do msgnum=$(($msgnum + 1)) echo "$cmt" > "$dotest/cmt.$msgnum"