Merge branch 'jc/maint-checkout-keep-remove' into maint

diff --git a/t/t4127-apply-same-fn.sh b/t/t4127-apply-same-fn.sh
index 1f859dd908cb298bf89a13822e8fc19882060689..3a8202ea9311b1c90158ad0d115dda985060fdeb 100755 (executable)
--- a/t/t4127-apply-same-fn.sh
+++ b/t/t4127-apply-same-fn.sh
@@ -26,7 +26,7 @@ test_expect_success 'apply same filename with independent changes' '
        git diff >> patch0 &&
        cp same_fn same_fn2 &&
        git reset --hard &&
-       git-apply patch0 &&
+       git apply patch0 &&
        diff same_fn same_fn2
 '
 
@@ -39,7 +39,7 @@ test_expect_success 'apply same filename with overlapping changes' '
        git diff >> patch0 &&
        cp same_fn same_fn2 &&
        git reset --hard &&
-       git-apply patch0 &&
+       git apply patch0 &&
        diff same_fn same_fn2
 '