Documentation: Fix misspellings
Signed-off-by: Leila Muhtasib <muhtasib@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Leila Muhtasib committed
Jun 22, 2012 at 16:03 UTC
8d8136c37a98bfb545f46990e3854df3414c3528
5 files changed
+6
-6
Documentation/diff-options.txt
+1
-1
@@ -59,7 +59,7 @@ endif::git-format-patch[]
59
Generate a diffstat. By default, as much space as necessary
60
will be used for the filename part, and the rest for the graph
61
part. Maximum width defaults to terminal width, or 80 columns
62
- if not connected to a terminal, and can be overriden by
62
+ if not connected to a terminal, and can be overridden by
63
`<width>`. The width of the filename part can be limited by
64
giving another width `<name-width>` after a comma. The width
65
of the graph part can be limited by using
Documentation/git-submodule.txt
+1
-1
@@ -140,7 +140,7 @@ update::
140
checkout the commit specified in the index of the containing repository.
141
This will make the submodules HEAD be detached unless `--rebase` or
142
`--merge` is specified or the key `submodule.$name.update` is set to
143
- `rebase`, `merge` or `none`. `none` can be overriden by specifying
143
+ `rebase`, `merge` or `none`. `none` can be overridden by specifying
144
`--checkout`.
145
+
146
If the submodule is not yet initialized, and you just want to use the
compat/nedmalloc/Readme.txt
+1
-1
@@ -100,7 +100,7 @@ v1.04alpha_svn915 7th October 2006:
100
Thanks to Dmitry Chichkov for reporting this. Futher thanks to Aleksey Sanin.
101
* Fixed realloc(0, <size>) segfaulting. Thanks to Dmitry Chichkov for
102
reporting this.
103
- * Made config defines #ifndef so they can be overriden by the build system.
103
+ * Made config defines #ifndef so they can be overridden by the build system.
104
Thanks to Aleksey Sanin for suggesting this.
105
* Fixed deadlock in nedprealloc() due to unnecessary locking of preferred
106
thread mspace when mspace_realloc() always uses the original block's mspace
t/t4253-am-keep-cr-dos.sh
+2
-2
@@ -62,7 +62,7 @@ test_expect_success 'am with dos files config am.keepcr' '
62
git diff --exit-code master
63
'
64
65
-test_expect_success 'am with dos files config am.keepcr overriden by --no-keep-cr' '
65
+test_expect_success 'am with dos files config am.keepcr overridden by --no-keep-cr' '
66
git config am.keepcr 1 &&
67
git checkout -b dosfiles-conf-keepcr-override initial &&
68
git format-patch -k initial..master &&
@@ -83,7 +83,7 @@ test_expect_success 'am with dos files with --keep-cr continue' '
83
git diff --exit-code master
84
'
85
86
-test_expect_success 'am with unix files config am.keepcr overriden by --no-keep-cr' '
86
+test_expect_success 'am with unix files config am.keepcr overridden by --no-keep-cr' '
87
git config am.keepcr 1 &&
88
git checkout -b unixfiles-conf-keepcr-override initial &&
89
cp -f file1 file &&
t/t9300-fast-import.sh
+1
-1
@@ -2117,7 +2117,7 @@ test_expect_success \
2117
grep :1 git.marks'
2118
2119
test_expect_success \
2120
- 'R: export-marks options can be overriden by commandline options' \
2120
+ 'R: export-marks options can be overridden by commandline options' \
2121
'cat input | git fast-import --export-marks=other.marks &&
2122
grep :1 other.marks'
2123