{"thread":{"id":"34214","subject":"small misspellings fixes","startedAt":"2013-06-19T05:37:24Z","lastAt":"2013-06-19T18:31:12Z","messageCount":3,"participants":["Veres Lajos","Matthieu Moy","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"221330","messageId":"alpine.DEB.2.00.1306190733440.8850@citymarket.hu","threadId":"34214","inReplyTo":null,"subject":"small misspellings fixes","fromName":"Veres Lajos","fromEmail":"vlajos@gmail.com","sentAt":"2013-06-19T05:37:24Z","receivedAt":"2013-06-19T05:37:24Z","isPatch":false,"sender":{"key":"vlajos@gmail.com","avatar":"https://avatars.githubusercontent.com/u/3994645?v=4"},"body":"small misspellings fixes\n\nSigned-off-by: Veres Lajos <vlajos@gmail.com>\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-- \nHi,\n\nI am trying to convert this pull request:\nhttps://github.com/git/git/pull/42\nto a proper patch email\n(Sorry If I miss something about the process.)\n-- \nVeres Lajos\nvlajos@gmail.com\n+36 20 438 5909\n"},{"id":"221331","messageId":"vpq7ghqmywf.fsf@anie.imag.fr","threadId":"34214","inReplyTo":"alpine.DEB.2.00.1306190733440.8850@citymarket.hu","subject":"Re: small misspellings fixes","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@grenoble-inp.fr","sentAt":"2013-06-19T05:51:12Z","receivedAt":"2013-06-19T05:51:12Z","isPatch":false,"sender":{"key":"matthieu.moy@grenoble-inp.fr","avatar":"https://gravatar.com/avatar/72c8a2705971a25dfaff23cece15130d405685845d911aedd5667ace277f3fc5?d=mp&s=160"},"body":"Veres Lajos <vlajos@gmail.com> writes:\n\n> I am trying to convert this pull request:\n> https://github.com/git/git/pull/42\n> to a proper patch email\n\nUse \"git format-patch\" and/or \"git send-email\" to get the proper\nformatting.\n\n> (Sorry If I miss something about the process.)\n\nYes, your patch doesn't have exactly the right format, and you should\nhave Cc-ed Junio (see Documentation/SubmittingPatches in Git's source\ntree).\n\nOther than that, the content of the patch looks good (and actually, at\nleast one of the typos is mine :-( ). Can you resend?\n\nThanks,\n\n-- \nMatthieu Moy\nhttp://www-verimag.imag.fr/~moy/\n"},{"id":"221392","messageId":"7vzjumymtr.fsf@alter.siamese.dyndns.org","threadId":"34214","inReplyTo":"vpq7ghqmywf.fsf@anie.imag.fr","subject":"Re: small misspellings fixes","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-06-19T18:31:12Z","receivedAt":"2013-06-19T18:31:12Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:\n\n> Veres Lajos <vlajos@gmail.com> writes:\n>\n>> I am trying to convert this pull request:\n>> https://github.com/git/git/pull/42\n>> to a proper patch email\n>\n> Use \"git format-patch\" and/or \"git send-email\" to get the proper\n> formatting.\n>\n>> (Sorry If I miss something about the process.)\n>\n> Yes, your patch doesn't have exactly the right format, and you should\n> have Cc-ed Junio (see Documentation/SubmittingPatches in Git's source\n> tree).\n>\n> Other than that, the content of the patch looks good (and actually, at\n> least one of the typos is mine :-( ). Can you resend?\n\nRepeating the subject in the body is unnecessary.\n\nI'll pick it up from here and will fix up.  No need to resend.\n\nThanks.\n"}]}