mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
Documentation: Fix misspellings
Signed-off-by: Leila Muhtasib <muhtasib@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
0e64a95ae5
commit
8d8136c37a
|
@ -59,7 +59,7 @@ endif::git-format-patch[]
|
||||||
Generate a diffstat. By default, as much space as necessary
|
Generate a diffstat. By default, as much space as necessary
|
||||||
will be used for the filename part, and the rest for the graph
|
will be used for the filename part, and the rest for the graph
|
||||||
part. Maximum width defaults to terminal width, or 80 columns
|
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
|
`<width>`. The width of the filename part can be limited by
|
||||||
giving another width `<name-width>` after a comma. The width
|
giving another width `<name-width>` after a comma. The width
|
||||||
of the graph part can be limited by using
|
of the graph part can be limited by using
|
||||||
|
|
|
@ -140,7 +140,7 @@ update::
|
||||||
checkout the commit specified in the index of the containing repository.
|
checkout the commit specified in the index of the containing repository.
|
||||||
This will make the submodules HEAD be detached unless `--rebase` or
|
This will make the submodules HEAD be detached unless `--rebase` or
|
||||||
`--merge` is specified or the key `submodule.$name.update` is set to
|
`--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`.
|
`--checkout`.
|
||||||
+
|
+
|
||||||
If the submodule is not yet initialized, and you just want to use the
|
If the submodule is not yet initialized, and you just want to use the
|
||||||
|
|
|
@ -100,7 +100,7 @@ v1.04alpha_svn915 7th October 2006:
|
||||||
Thanks to Dmitry Chichkov for reporting this. Futher thanks to Aleksey Sanin.
|
Thanks to Dmitry Chichkov for reporting this. Futher thanks to Aleksey Sanin.
|
||||||
* Fixed realloc(0, <size>) segfaulting. Thanks to Dmitry Chichkov for
|
* Fixed realloc(0, <size>) segfaulting. Thanks to Dmitry Chichkov for
|
||||||
reporting this.
|
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.
|
Thanks to Aleksey Sanin for suggesting this.
|
||||||
* Fixed deadlock in nedprealloc() due to unnecessary locking of preferred
|
* Fixed deadlock in nedprealloc() due to unnecessary locking of preferred
|
||||||
thread mspace when mspace_realloc() always uses the original block's mspace
|
thread mspace when mspace_realloc() always uses the original block's mspace
|
||||||
|
|
|
@ -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 config am.keepcr 1 &&
|
||||||
git checkout -b dosfiles-conf-keepcr-override initial &&
|
git checkout -b dosfiles-conf-keepcr-override initial &&
|
||||||
git format-patch -k initial..master &&
|
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 config am.keepcr 1 &&
|
||||||
git checkout -b unixfiles-conf-keepcr-override initial &&
|
git checkout -b unixfiles-conf-keepcr-override initial &&
|
||||||
cp -f file1 file &&
|
cp -f file1 file &&
|
||||||
|
|
|
@ -2117,7 +2117,7 @@ test_expect_success \
|
||||||
grep :1 git.marks'
|
grep :1 git.marks'
|
||||||
|
|
||||||
test_expect_success \
|
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 &&
|
'cat input | git fast-import --export-marks=other.marks &&
|
||||||
grep :1 other.marks'
|
grep :1 other.marks'
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue