{"thread":{"id":"34210","subject":"small misspellings fixes","startedAt":"2013-06-18T23:04:37Z","lastAt":"2013-06-19T04:15:47Z","messageCount":2,"participants":["Veres Lajos","Ramkumar Ramachandra"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"221310","messageId":"alpine.DEB.2.00.1306190100190.8850@citymarket.hu","threadId":"34210","inReplyTo":null,"subject":"small misspellings fixes","fromName":"Veres Lajos","fromEmail":"vlajos@gmail.com","sentAt":"2013-06-18T23:04:37Z","receivedAt":"2013-06-18T23:04:37Z","isPatch":false,"sender":{"key":"vlajos@gmail.com","avatar":"https://avatars.githubusercontent.com/u/3994645?v=4"},"body":"Hi,\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\nI found a few trivial misspellings.\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"},{"id":"221323","messageId":"CALkWK0=PZXqY3EZj8vQpg3facOFjHp8eEuG4imAx5Qi89sY5+w@mail.gmail.com","threadId":"34210","inReplyTo":"alpine.DEB.2.00.1306190100190.8850@citymarket.hu","subject":"Re: small misspellings fixes","fromName":"Ramkumar Ramachandra","fromEmail":"artagnon@gmail.com","sentAt":"2013-06-19T04:15:47Z","receivedAt":"2013-06-19T04:15:47Z","isPatch":false,"sender":{"key":"r@artagnon.com","avatar":"https://avatars.githubusercontent.com/u/37226?v=4"},"body":"Veres Lajos wrote:\n> Subject: small misspelling fixes\n\nGood.\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> (Sorry If I miss something about the process.)\n\nThis does not belong in the commit message: you don't want this to be\nshown when someone is reading 'git log' output, do you?  Put such\ncomments under the \"--\" line after the signoff, so it'll be ignored by\ngit am.\n\nThanks.\n"}]}