Documentation: Fix misspellings

Signed-off-by: Leila Muhtasib <muhtasib@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 6cfedd85dc890809a08e0236925a04b4f0d4b26d..cf4b21659890ba4babb8bcc07a7c0e84a03b6adb 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -59,7 +59,7 @@ endif::git-format-patch[]
        Generate a diffstat. By default, as much space as necessary
        will be used for the filename part, and the rest for the graph
        part. Maximum width defaults to terminal width, or 80 columns
        Generate a diffstat. By default, as much space as necessary
        will be used for the filename part, and the rest for the graph
        part. Maximum width defaults to terminal width, or 80 columns

-       if not connected to a terminal, and can be overriden by
+       if not connected to a terminal, and can be overridden by

        `<width>`. The width of the filename part can be limited by
        giving another width `<name-width>` after a comma. The width
        of the graph part can be limited by using
        `<width>`. The width of the filename part can be limited by
        giving another width `<name-width>` after a comma. The width
        of the graph part can be limited by using

diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt
index 9e488c0aad433f7478d1334e53f8c5e5dd1878ed..fbbbcb282cc8d6b2fd9c0ea8aea28d4a584646ea 100644 (file)
--- a/Documentation/git-submodule.txt
+++ b/Documentation/git-submodule.txt
@@ -140,7 +140,7 @@ update::
        checkout the commit specified in the index of the containing repository.
        This will make the submodules HEAD be detached unless `--rebase` or
        `--merge` is specified or the key `submodule.$name.update` is set to
        checkout the commit specified in the index of the containing repository.
        This will make the submodules HEAD be detached unless `--rebase` or
        `--merge` is specified or the key `submodule.$name.update` is set to

-       `rebase`, `merge` or `none`. `none` can be overriden by specifying
+       `rebase`, `merge` or `none`. `none` can be overridden by specifying

        `--checkout`.
 +
 If the submodule is not yet initialized, and you just want to use the
        `--checkout`.
 +
 If the submodule is not yet initialized, and you just want to use the

diff --git a/compat/nedmalloc/Readme.txt b/compat/nedmalloc/Readme.txt
index 876365646edacf2adbf1bcd9c6133c3519c3fb82..e46d8f112cc6a2c39f5ae922ef8b2ca5203d50b1 100644 (file)
--- a/compat/nedmalloc/Readme.txt
+++ b/compat/nedmalloc/Readme.txt
@@ -100,7 +100,7 @@ v1.04alpha_svn915 7th October 2006:
 Thanks to Dmitry Chichkov for reporting this. Futher thanks to Aleksey Sanin.
  * Fixed realloc(0, <size>) segfaulting. Thanks to Dmitry Chichkov for
 reporting this.
 Thanks to Dmitry Chichkov for reporting this. Futher thanks to Aleksey Sanin.
  * Fixed realloc(0, <size>) segfaulting. Thanks to Dmitry Chichkov for
 reporting this.

- * Made config defines #ifndef so they can be overriden by the build system.
+ * Made config defines #ifndef so they can be overridden by the build system.

 Thanks to Aleksey Sanin for suggesting this.
  * Fixed deadlock in nedprealloc() due to unnecessary locking of preferred
 thread mspace when mspace_realloc() always uses the original block's mspace
 Thanks to Aleksey Sanin for suggesting this.
  * Fixed deadlock in nedprealloc() due to unnecessary locking of preferred
 thread mspace when mspace_realloc() always uses the original block's mspace

diff --git a/t/t4253-am-keep-cr-dos.sh b/t/t4253-am-keep-cr-dos.sh
index 735e55d77c1dcf88b555ca44ab70cf981374fc12..553fe3e88e0d90bde62ec4f257bd0648f917f0b5 100755 (executable)
--- a/t/t4253-am-keep-cr-dos.sh
+++ b/t/t4253-am-keep-cr-dos.sh
@@ -62,7 +62,7 @@ test_expect_success 'am with dos files config am.keepcr' '
        git diff --exit-code master
 '
 
        git diff --exit-code master
 '
 

-test_expect_success 'am with dos files config am.keepcr overriden by --no-keep-cr' '
+test_expect_success 'am with dos files config am.keepcr overridden by --no-keep-cr' '

        git config am.keepcr 1 &&
        git checkout -b dosfiles-conf-keepcr-override initial &&
        git format-patch -k initial..master &&
        git config am.keepcr 1 &&
        git checkout -b dosfiles-conf-keepcr-override initial &&
        git format-patch -k initial..master &&


@@ -83,7 +83,7 @@ test_expect_success 'am with dos files with --keep-cr continue' '
        git diff --exit-code master
 '
 
        git diff --exit-code master
 '
 

-test_expect_success 'am with unix files config am.keepcr overriden by --no-keep-cr' '
+test_expect_success 'am with unix files config am.keepcr overridden by --no-keep-cr' '

        git config am.keepcr 1 &&
        git checkout -b unixfiles-conf-keepcr-override initial &&
        cp -f file1 file &&
        git config am.keepcr 1 &&
        git checkout -b unixfiles-conf-keepcr-override initial &&
        cp -f file1 file &&

diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh
index 2aa1824a940aa955fab408995d2479e50bd42b96..c17f52e586747198a74323b578a654edec436f57 100755 (executable)
--- a/t/t9300-fast-import.sh
+++ b/t/t9300-fast-import.sh
@@ -2117,7 +2117,7 @@ test_expect_success \
     grep :1 git.marks'
 
 test_expect_success \
     grep :1 git.marks'
 
 test_expect_success \

-    'R: export-marks options can be overriden by commandline options' \
+    'R: export-marks options can be overridden by commandline options' \

     'cat input | git fast-import --export-marks=other.marks &&
     grep :1 other.marks'
 
     'cat input | git fast-import --export-marks=other.marks &&
     grep :1 other.marks'