X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft3409-rebase-preserve-merges.sh;h=8f785e7957519eaa3dd1ef946c905054c4fa0e6c;hb=a26df4cd2fdad7451d4ec99f8a339b9e107a4728;hp=297d165476b93e18b18bf42bc81f4740cf18db9f;hpb=814035c12a07927ea03350184a14f869cdce7276;p=git.git diff --git a/t/t3409-rebase-preserve-merges.sh b/t/t3409-rebase-preserve-merges.sh index 297d16547..8f785e795 100755 --- a/t/t3409-rebase-preserve-merges.sh +++ b/t/t3409-rebase-preserve-merges.sh @@ -32,14 +32,14 @@ export GIT_AUTHOR_EMAIL test_expect_success 'setup for merge-preserving rebase' \ 'echo First > A && git add A && - git-commit -m "Add A1" && + git commit -m "Add A1" && git checkout -b topic && echo Second > B && git add B && - git-commit -m "Add B1" && + git commit -m "Add B1" && git checkout -f master && echo Third >> A && - git-commit -a -m "Modify A2" && + git commit -a -m "Modify A2" && git clone ./. clone1 && cd clone1 &&