This command redoes merges. It's useful if you rebase a branch that
contains merges and you want to preserve these merges. You can also use
it to add new merges.
Signed-off-by: Jörg Sommer <joerg@xxxxxxxxxxxx>
---
git-rebase--interactive.sh | 24 ++++++++++++++++++++++++
t/t3404-rebase-interactive.sh | 13 +++++++++++++
2 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 19145b1..fd41ca0 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -356,6 +356,28 @@ do_next () {
git update-ref "$mark" HEAD || die "update-ref failed"
;;
+ merge|m)
+ comment_for_reflog merge
+
+ if ! git rev-parse --verify $sha1 > /dev/null
+ then
+ die "Invalid reference merge '$sha1' in"
+ "$command $sha1 $rest"
+ fi
+
+ new_parents=
+ for p in $rest
+ do
+ new_parents="$new_parents $(mark_to_ref $p)"
+ done
+ new_parents="${new_parents# }"
+ test -n "$new_parents" || \
+ die "You forgot to give the parents for the" \
+ "merge $sha1. Please fix it in $TODO"
+
+ mark_action_done
+ redo_merge $sha1 $new_parents
+ ;;
reset|r)
comment_for_reflog reset
@@ -587,6 +609,8 @@ do
# squash = use commit, but meld into previous commit
# mark :mark = mark the current HEAD for later reference
# reset commit = reset HEAD to the commit
+# merge commit-M commit-P ... = redo merge commit-M with the
+# current HEAD and the parents commit-P
#
# If you remove a line here THAT COMMIT WILL BE LOST.
# However, if you remove everything, the rebase will be aborted.
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 78673a6..ceb9d74 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -88,6 +88,9 @@ for line in $FAKE_LINES; do
reset*)
echo "reset ${line#reset}"
echo "reset ${line#reset}" >> "$1";;
+ merge*)
+ echo "merge ${line#merge}" | tr / ' '
+ echo "merge ${line#merge}" | tr / ' ' >> "$1";;
*)
echo sed -n "${line}s/^pick/$action/p"
sed -n "${line}p" < "$1".tmp
@@ -223,6 +226,16 @@ test_expect_success 'reset to HEAD is a nop' '
test "$(git rev-parse --short HEAD)" = "$head"
'
+test_expect_success 'merge redoes merges' '
+ test_tick &&
+ git merge dead-end &&
+ merge=$(git rev-parse HEAD) &&
+ git reset --hard HEAD~1 &&
+ FAKE_LINES="1 merge$merge/dead-end" git rebase -i HEAD~1 &&
+ test $merge = "$(git rev-parse HEAD)" &&
+ git reset --hard HEAD~1
+'
+
test_expect_success 'preserve merges with -p' '
git checkout -b to-be-preserved master^ &&
: > unrelated-file &&
--
1.5.5
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
