diff options
author | Ville Skyttä <ville.skytta@iki.fi> | 2016-08-09 11:53:38 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-08-11 14:35:42 -0700 |
commit | 2e3a16b279a9df2e498187871c67e623e12bc8a4 (patch) | |
tree | 9eed32d1cfcbe32944e36f1b02fb2876e0707a67 /contrib | |
parent | a0a1831b034af10e5d5b37b99489a7558f9cc547 (diff) | |
download | git-2e3a16b279a9df2e498187871c67e623e12bc8a4.tar.gz |
Spelling fixesvs/typofix
<BAD> <CORRECTED>
accidently accidentally
commited committed
dependancy dependency
emtpy empty
existance existence
explicitely explicitly
git-upload-achive git-upload-archive
hierachy hierarchy
indegee indegree
intial initial
mulitple multiple
non-existant non-existent
precendence. precedence.
priviledged privileged
programatically programmatically
psuedo-binary pseudo-binary
soemwhere somewhere
successfull successful
transfering transferring
uncommited uncommitted
unkown unknown
usefull useful
writting writing
Signed-off-by: Ville Skyttä <ville.skytta@iki.fi>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/hooks/multimail/README | 4 | ||||
-rw-r--r-- | contrib/mw-to-git/.perlcriticrc | 2 | ||||
-rwxr-xr-x | contrib/mw-to-git/git-remote-mediawiki.perl | 2 | ||||
-rwxr-xr-x | contrib/subtree/t/t7900-subtree.sh | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/contrib/hooks/multimail/README b/contrib/hooks/multimail/README index 0c91d19a57..22a23cdb94 100644 --- a/contrib/hooks/multimail/README +++ b/contrib/hooks/multimail/README @@ -294,7 +294,7 @@ multimailhook.htmlInIntro, multimailhook.htmlInFooter like ``<a href="foo">link</a>``, the reader will see the HTML source code and not a proper link. - Set ``multimailhook.htmlInIntro`` to true to allow writting HTML + Set ``multimailhook.htmlInIntro`` to true to allow writing HTML formatting in introduction templates. Similarly, set ``multimailhook.htmlInFooter`` for HTML in the footer. @@ -516,7 +516,7 @@ multimailhook.commitLogOpts multimailhook.dateSubstitute String to use as a substitute for ``Date:`` in the output of ``git - log`` while formatting commit messages. This is usefull to avoid + log`` while formatting commit messages. This is useful to avoid emitting a line that can be interpreted by mailers as the start of a cited message (Zimbra webmail in particular). Defaults to ``CommitDate:``. Set to an empty string or ``none`` to deactivate diff --git a/contrib/mw-to-git/.perlcriticrc b/contrib/mw-to-git/.perlcriticrc index 5a9955d757..158958d363 100644 --- a/contrib/mw-to-git/.perlcriticrc +++ b/contrib/mw-to-git/.perlcriticrc @@ -19,7 +19,7 @@ [InputOutput::RequireCheckedSyscalls] functions = open say close -# This rules demands to add a dependancy for the Readonly module. This is not +# This rule demands to add a dependency for the Readonly module. This is not # wished. [-ValuesAndExpressions::ProhibitConstantPragma] diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-to-git/git-remote-mediawiki.perl index 8dd74a9a40..41e74fba1e 100755 --- a/contrib/mw-to-git/git-remote-mediawiki.perl +++ b/contrib/mw-to-git/git-remote-mediawiki.perl @@ -963,7 +963,7 @@ sub mw_upload_file { print {*STDERR} "Check the configuration of file uploads in your mediawiki.\n"; return $newrevid; } - # Deleting and uploading a file requires a priviledged user + # Deleting and uploading a file requires a privileged user if ($file_deleted) { $mediawiki = connect_maybe($mediawiki, $remotename, $url); my $query = { diff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh index 9751cfe9e6..3c87ebaf57 100755 --- a/contrib/subtree/t/t7900-subtree.sh +++ b/contrib/subtree/t/t7900-subtree.sh @@ -948,7 +948,7 @@ test_expect_success 'split a new subtree without --onto option' ' # also test that we still can split out an entirely new subtree # if the parent of the first commit in the tree is not empty, - # then the new subtree has accidently been attached to something + # then the new subtree has accidentally been attached to something git subtree split --prefix="sub dir2" --branch subproj2-br && check_equal "$(git log --pretty=format:%P -1 subproj2-br)" "" ) |