From: Junio C Hamano Date: Thu, 5 Sep 2013 21:51:17 +0000 (-0700) Subject: typofix: cherry is spelled with two ars X-Git-Tag: v1.8.5-rc0~144^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7a96c3864eea4e83b37fc3ab56a43e22243ff3db;p=thirdparty%2Fgit.git typofix: cherry is spelled with two ars Do not say chery; it is spelled cherry. Signed-off-by: Junio C Hamano --- diff --git a/t/t3501-revert-cherry-pick.sh b/t/t3501-revert-cherry-pick.sh index 6f489e20ee..46aaf2f511 100755 --- a/t/t3501-revert-cherry-pick.sh +++ b/t/t3501-revert-cherry-pick.sh @@ -100,7 +100,7 @@ test_expect_success 'revert forbidden on dirty working tree' ' ' -test_expect_success 'chery-pick on unborn branch' ' +test_expect_success 'cherry-pick on unborn branch' ' git checkout --orphan unborn && git rm --cached -r . && rm -rf * && diff --git a/t/t3506-cherry-pick-ff.sh b/t/t3506-cherry-pick-ff.sh index 373aad623c..fb889ac6f0 100755 --- a/t/t3506-cherry-pick-ff.sh +++ b/t/t3506-cherry-pick-ff.sh @@ -105,7 +105,7 @@ test_expect_success 'cherry pick a root commit with --ff' ' test "$(git rev-parse --verify HEAD)" = "1df192cd8bc58a2b275d842cede4d221ad9000d1" ' -test_expect_success 'chery-pick --ff on unborn branch' ' +test_expect_success 'cherry-pick --ff on unborn branch' ' git checkout --orphan unborn && git rm --cached -r . && rm -rf * &&