Enable "git rerere" by the config variable rerere.enabled

diff --git a/t/t2200-add-update.sh b/t/t2200-add-update.sh
index 83005e70d00f5805e26b8873df2598225453fe83..0a703af14976d7e546e1b5fde6affbde22b724c2 100755 (executable)
--- a/t/t2200-add-update.sh
+++ b/t/t2200-add-update.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-test_description='git-add -u with path limiting
+test_description='git add -u with path limiting
 
 This test creates a working tree state with three files:
 
@@ -8,7 +8,7 @@ This test creates a working tree state with three files:
   dir/sub (previously committed, modified)
   dir/other (untracked)
 
-and issues a git-add -u with path limiting on "dir" to add
+and issues a git add -u with path limiting on "dir" to add
 only the updates to dir/sub.'
 
 . ./test-lib.sh
@@ -17,22 +17,22 @@ test_expect_success 'setup' '
 echo initial >top &&
 mkdir dir &&
 echo initial >dir/sub &&
-git-add dir/sub top &&
+git add dir/sub top &&
 git-commit -m initial &&
 echo changed >top &&
 echo changed >dir/sub &&
 echo other >dir/other
 '
 
-test_expect_success 'update' 'git-add -u dir'
+test_expect_success 'update' 'git add -u dir'
 
 test_expect_success 'update touched correct path' \
-  'test "`git-diff-files --name-status dir/sub`" = ""'
+  'test "`git diff-files --name-status dir/sub`" = ""'
 
 test_expect_success 'update did not touch other tracked files' \
-  'test "`git-diff-files --name-status top`" = "M      top"'
+  'test "`git diff-files --name-status top`" = "M      top"'
 
 test_expect_success 'update did not touch untracked files' \
-  'test "`git-diff-files --name-status dir/other`" = ""'
+  'test "`git diff-files --name-status dir/other`" = ""'
 
 test_done