Skip to content

Commit

Permalink
Merge branch 'jc/commit-is-spelled-with-two-ems'
Browse files Browse the repository at this point in the history
* jc/commit-is-spelled-with-two-ems:
  typofix: cherry is spelled with two ars
  typofix: commit is spelled with two ems
  • Loading branch information
Junio C Hamano committed Sep 12, 2013
2 parents c7c377d + 7a96c38 commit af9a0ca
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion notes-utils.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* Properties of the created commit:
* - tree: the result of converting t to a tree object with write_notes_tree().
* - parents: the given parents OR (if NULL) the commit referenced by t->ref.
* - author/committer: the default determined by commmit_tree().
* - author/committer: the default determined by commit_tree().
* - commit message: msg
*
* The resulting commit SHA1 is stored in result_sha1.
Expand Down
2 changes: 1 addition & 1 deletion t/t3501-revert-cherry-pick.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 * &&
Expand Down
2 changes: 1 addition & 1 deletion t/t3506-cherry-pick-ff.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 * &&
Expand Down
2 changes: 1 addition & 1 deletion t/t3509-cherry-pick-merge-df.sh
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ test_expect_success 'Setup rename with file on one side matching different dirna
echo content > sub/file &&
echo foo > othersub/whatever &&
git add -A &&
git commit -m "Common commmit" &&
git commit -m "Common commit" &&
git rm -rf othersub &&
git mv sub/file othersub &&
Expand Down
14 changes: 7 additions & 7 deletions t/t6022-merge-rename.sh
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ test_expect_success 'setup for rename + d/f conflicts' '
printf "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n" >sub/file &&
echo foo >dir/file-in-the-way &&
git add -A &&
git commit -m "Common commmit" &&
git commit -m "Common commit" &&
echo 11 >>sub/file &&
echo more >>dir/file-in-the-way &&
Expand Down Expand Up @@ -439,7 +439,7 @@ test_expect_success 'setup both rename source and destination involved in D/F co
mkdir one &&
echo stuff >one/file &&
git add -A &&
git commit -m "Common commmit" &&
git commit -m "Common commit" &&
git mv one/file destdir &&
git commit -m "Renamed to destdir" &&
Expand Down Expand Up @@ -479,7 +479,7 @@ test_expect_success 'setup pair rename to parent of other (D/F conflicts)' '
echo stuff >one/file &&
echo other >two/file &&
git add -A &&
git commit -m "Common commmit" &&
git commit -m "Common commit" &&
git rm -rf one &&
git mv two/file one &&
Expand Down Expand Up @@ -539,7 +539,7 @@ test_expect_success 'setup rename of one file to two, with directories in the wa
echo stuff >original &&
git add -A &&
git commit -m "Common commmit" &&
git commit -m "Common commit" &&
mkdir two &&
>two/file &&
Expand Down Expand Up @@ -583,7 +583,7 @@ test_expect_success 'setup rename one file to two; directories moving out of the
mkdir one two &&
touch one/file two/file &&
git add -A &&
git commit -m "Common commmit" &&
git commit -m "Common commit" &&
git rm -rf one &&
git mv original one &&
Expand Down Expand Up @@ -618,7 +618,7 @@ test_expect_success 'setup avoid unnecessary update, normal rename' '
printf "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n" >original &&
git add -A &&
git commit -m "Common commmit" &&
git commit -m "Common commit" &&
git mv original rename &&
echo 11 >>rename &&
Expand Down Expand Up @@ -649,7 +649,7 @@ test_expect_success 'setup to test avoiding unnecessary update, with D/F conflic
mkdir df &&
printf "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n" >df/file &&
git add -A &&
git commit -m "Common commmit" &&
git commit -m "Common commit" &&
git mv df/file temp &&
rm -rf df &&
Expand Down

0 comments on commit af9a0ca

Please sign in to comment.