{"thread":{"id":"30875","subject":"[PATCH v2] Documentation: Fix misspellings","startedAt":"2012-06-22T20:03:01Z","lastAt":"2012-06-22T21:25:18Z","messageCount":2,"participants":["Leila Muhtasib","Junio C Hamano"],"isPatch":true,"patchVersion":2,"patchTotal":null},"messages":[{"id":"194095","messageId":"1340395381-19952-1-git-send-email-muhtasib@gmail.com","threadId":"30875","inReplyTo":null,"subject":"[PATCH v2] Documentation: Fix misspellings","fromName":"Leila Muhtasib","fromEmail":"muhtasib@gmail.com","sentAt":"2012-06-22T20:03:01Z","receivedAt":"2012-06-22T20:03:01Z","isPatch":true,"sender":{"key":"muhtasib@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1618875?v=4"},"body":"\nSigned-off-by: Leila Muhtasib <muhtasib@gmail.com>\n---\n Documentation/diff-options.txt  |    2 +-\n Documentation/git-submodule.txt |    2 +-\n compat/nedmalloc/Readme.txt     |    2 +-\n t/t4253-am-keep-cr-dos.sh       |    4 ++--\n t/t9300-fast-import.sh          |    2 +-\n 5 files changed, 6 insertions(+), 6 deletions(-)\n\ndiff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt\nindex 6cfedd8..cf4b216 100644\n--- a/Documentation/diff-options.txt\n+++ b/Documentation/diff-options.txt\n@@ -59,7 +59,7 @@ endif::git-format-patch[]\n \tGenerate a diffstat. By default, as much space as necessary\n \twill be used for the filename part, and the rest for the graph\n \tpart. Maximum width defaults to terminal width, or 80 columns\n-\tif not connected to a terminal, and can be overriden by\n+\tif not connected to a terminal, and can be overridden by\n \t`<width>`. The width of the filename part can be limited by\n \tgiving another width `<name-width>` after a comma. The width\n \tof the graph part can be limited by using\ndiff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt\nindex 9e488c0..fbbbcb2 100644\n--- a/Documentation/git-submodule.txt\n+++ b/Documentation/git-submodule.txt\n@@ -140,7 +140,7 @@ update::\n \tcheckout the commit specified in the index of the containing repository.\n \tThis will make the submodules HEAD be detached unless `--rebase` or\n \t`--merge` is specified or the key `submodule.$name.update` is set to\n-\t`rebase`, `merge` or `none`. `none` can be overriden by specifying\n+\t`rebase`, `merge` or `none`. `none` can be overridden by specifying\n \t`--checkout`.\n +\n If the submodule is not yet initialized, and you just want to use the\ndiff --git a/compat/nedmalloc/Readme.txt b/compat/nedmalloc/Readme.txt\nindex 8763656..e46d8f1 100644\n--- a/compat/nedmalloc/Readme.txt\n+++ b/compat/nedmalloc/Readme.txt\n@@ -100,7 +100,7 @@ v1.04alpha_svn915 7th October 2006:\n Thanks to Dmitry Chichkov for reporting this. Futher thanks to Aleksey Sanin.\n  * Fixed realloc(0, <size>) segfaulting. Thanks to Dmitry Chichkov for\n reporting this.\n- * Made config defines #ifndef so they can be overriden by the build system.\n+ * Made config defines #ifndef so they can be overridden by the build system.\n Thanks to Aleksey Sanin for suggesting this.\n  * Fixed deadlock in nedprealloc() due to unnecessary locking of preferred\n thread mspace when mspace_realloc() always uses the original block's mspace\ndiff --git a/t/t4253-am-keep-cr-dos.sh b/t/t4253-am-keep-cr-dos.sh\nindex 735e55d..553fe3e 100755\n--- a/t/t4253-am-keep-cr-dos.sh\n+++ b/t/t4253-am-keep-cr-dos.sh\n@@ -62,7 +62,7 @@ test_expect_success 'am with dos files config am.keepcr' '\n \tgit diff --exit-code master\n '\n \n-test_expect_success 'am with dos files config am.keepcr overriden by --no-keep-cr' '\n+test_expect_success 'am with dos files config am.keepcr overridden by --no-keep-cr' '\n \tgit config am.keepcr 1 &&\n \tgit checkout -b dosfiles-conf-keepcr-override initial &&\n \tgit format-patch -k initial..master &&\n@@ -83,7 +83,7 @@ test_expect_success 'am with dos files with --keep-cr continue' '\n \tgit diff --exit-code master\n '\n \n-test_expect_success 'am with unix files config am.keepcr overriden by --no-keep-cr' '\n+test_expect_success 'am with unix files config am.keepcr overridden by --no-keep-cr' '\n \tgit config am.keepcr 1 &&\n \tgit checkout -b unixfiles-conf-keepcr-override initial &&\n \tcp -f file1 file &&\ndiff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh\nindex 2aa1824..c17f52e 100755\n--- a/t/t9300-fast-import.sh\n+++ b/t/t9300-fast-import.sh\n@@ -2117,7 +2117,7 @@ test_expect_success \\\n     grep :1 git.marks'\n \n test_expect_success \\\n-    'R: export-marks options can be overriden by commandline options' \\\n+    'R: export-marks options can be overridden by commandline options' \\\n     'cat input | git fast-import --export-marks=other.marks &&\n     grep :1 other.marks'\n \n-- \n1.7.7.5 (Apple Git-26)\n"},{"id":"194105","messageId":"7vsjdnm43l.fsf@alter.siamese.dyndns.org","threadId":"30875","inReplyTo":"1340395381-19952-1-git-send-email-muhtasib@gmail.com","subject":"Re: [PATCH v2] Documentation: Fix misspellings","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-06-22T21:25:18Z","receivedAt":"2012-06-22T21:25:18Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thanks.\n"}]}