{"thread":{"id":"34222","subject":"[PATCH] misspellings fixes by https://github.com/vlajos/misspell_fixer","startedAt":"2013-06-19T22:37:09Z","lastAt":"2013-06-19T22:37:09Z","messageCount":1,"participants":["Veres Lajos"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"221417","messageId":"alpine.DEB.2.00.1306200036230.8850@citymarket.hu","threadId":"34222","inReplyTo":null,"subject":"[PATCH] misspellings fixes by https://github.com/vlajos/misspell_fixer","fromName":"Veres Lajos","fromEmail":"vlajos@gmail.com","sentAt":"2013-06-19T22:37:09Z","receivedAt":"2013-06-19T22:37:09Z","isPatch":true,"sender":{"key":"vlajos@gmail.com","avatar":"https://avatars.githubusercontent.com/u/3994645?v=4"},"body":"\nSigned-off-by: Veres Lajos <vlajos@gmail.com>\n---\n git-p4.py        |    2 +-\n git-svn.perl     |    2 +-\n t/t7600-merge.sh |    2 +-\n 3 files changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/git-p4.py b/git-p4.py\nindex 911bbce..88fcf23 100755\n--- a/git-p4.py\n+++ b/git-p4.py\n@@ -3168,7 +3168,7 @@ class P4Rebase(Command):\n         if os.system(\"git update-index --refresh\") != 0:\n             die(\"Some files in your working directory are modified and different than what is in your index. You can use git update-index <filename> to bring the index up-to-date or stash away all your changes with git stash.\");\n         if len(read_pipe(\"git diff-index HEAD --\")) > 0:\n-            die(\"You have uncommited changes. Please commit them before rebasing or stash them away with git stash.\");\n+            die(\"You have uncommitted changes. Please commit them before rebasing or stash them away with git stash.\");\n\n         [upstream, settings] = findUpstreamBranchPoint()\n         if len(upstream) == 0:\ndiff --git a/git-svn.perl b/git-svn.perl\nindex d070de0..4e8275f 100755\n--- a/git-svn.perl\n+++ b/git-svn.perl\n@@ -1246,7 +1246,7 @@ sub cmd_rebase {\n \t\treturn;\n \t}\n \tif (command(qw/diff-index HEAD --/)) {\n-\t\tprint STDERR \"Cannot rebase with uncommited changes:\\n\";\n+\t\tprint STDERR \"Cannot rebase with uncommitted changes:\\n\";\n \t\tcommand_noisy('status');\n \t\texit 1;\n \t}\ndiff --git a/t/t7600-merge.sh b/t/t7600-merge.sh\nindex 2f70433..460d8eb 100755\n--- a/t/t7600-merge.sh\n+++ b/t/t7600-merge.sh\n@@ -316,7 +316,7 @@ test_expect_success 'merge c1 with c2 (squash)' '\n\n test_debug 'git log --graph --decorate --oneline --all'\n\n-test_expect_success 'unsuccesful merge of c1 with c2 (squash, ff-only)' '\n+test_expect_success 'unsuccessful merge of c1 with c2 (squash, ff-only)' '\n \tgit reset --hard c1 &&\n \ttest_must_fail git merge --squash --ff-only c2\n '\n-- \n1.7.10.4\n"}]}