Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Fix t3411.3 to actually rebase something
[gitweb.git]
/
t
/
t3411-rebase-preserve-around-merges.sh
diff --git
a/t/t3411-rebase-preserve-around-merges.sh
b/t/t3411-rebase-preserve-around-merges.sh
index 14a23cd8726fbb33df480133ed0466177916b7fb..fbe896f24ec30c0e612e739d9479ae7c3cc0022d 100755
(executable)
--- a/
t/t3411-rebase-preserve-around-merges.sh
+++ b/
t/t3411-rebase-preserve-around-merges.sh
@@
-56,6
+56,7
@@
test_expect_success 'squash F1 into D1' '
# And rebase G1..M1 onto E2
test_expect_success 'rebase two levels of merge' '
+ git checkout A1 &&
test_commit G1 &&
test_commit H1 &&
test_commit I1 &&