aboutsummaryrefslogtreecommitdiff
path: root/t/t3409-rebase-preserve-merges.sh
diff options
context:
space:
mode:
authorMatthew Ogilvie <mmogilvi_git@miniinfo.net>2009-11-28 11:38:55 -0700
committerJunio C Hamano <gitster@pobox.com>2009-11-29 23:09:47 -0800
commit5d59a4016bdc068cd49e2a1c43caf4fa59896391 (patch)
tree670c176a37e7e24ae722a1887ef5473a562ebf0f /t/t3409-rebase-preserve-merges.sh
parent42ac496edc3dcd1f0b272da62401f62c47f93312 (diff)
downloadgit-5d59a4016bdc068cd49e2a1c43caf4fa59896391.tar.gz
git-5d59a4016bdc068cd49e2a1c43caf4fa59896391.tar.xz
t3409 t4107 t7406 t9150: use dashless commands
This is needed to allow test suite to run against a standard install bin directory instead of GIT_EXEC_PATH. Signed-off-by: Matthew Ogilvie <mmogilvi_git@miniinfo.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3409-rebase-preserve-merges.sh')
-rwxr-xr-xt/t3409-rebase-preserve-merges.sh6
1 files changed, 3 insertions, 3 deletions
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 &&