summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Documentation/CodingGuidelines4
-rw-r--r--Documentation/RelNotes/1.5.0.txt4
-rw-r--r--Documentation/RelNotes/1.6.5.4.txt2
-rw-r--r--Documentation/RelNotes/1.7.0.2.txt2
-rw-r--r--Documentation/RelNotes/1.7.10.4.txt2
-rw-r--r--Documentation/RelNotes/1.7.12.3.txt2
-rw-r--r--Documentation/RelNotes/1.7.5.3.txt2
-rw-r--r--Documentation/RelNotes/1.8.0.txt2
-rw-r--r--Documentation/RelNotes/1.8.4.1.txt2
-rw-r--r--Documentation/RelNotes/2.1.3.txt2
-rw-r--r--Documentation/RelNotes/2.10.0.txt2
-rw-r--r--Documentation/RelNotes/2.10.2.txt2
-rw-r--r--Documentation/RelNotes/2.11.1.txt2
-rw-r--r--Documentation/RelNotes/2.12.0.txt2
-rw-r--r--Documentation/RelNotes/2.13.0.txt2
-rw-r--r--Documentation/RelNotes/2.13.3.txt4
-rw-r--r--Documentation/RelNotes/2.14.0.txt4
-rw-r--r--Documentation/RelNotes/2.16.0.txt2
-rw-r--r--Documentation/RelNotes/2.16.3.txt2
-rw-r--r--Documentation/RelNotes/2.17.0.txt2
-rw-r--r--Documentation/RelNotes/2.18.0.txt2
-rw-r--r--Documentation/RelNotes/2.19.0.txt2
-rw-r--r--Documentation/RelNotes/2.20.0.txt2
-rw-r--r--Documentation/RelNotes/2.3.3.txt2
-rw-r--r--Documentation/RelNotes/2.3.7.txt2
-rw-r--r--Documentation/RelNotes/2.4.3.txt2
-rw-r--r--Documentation/RelNotes/2.7.0.txt2
-rw-r--r--Documentation/RelNotes/2.8.0.txt2
-rw-r--r--Documentation/RelNotes/2.9.3.txt2
-rw-r--r--Documentation/config.txt2
-rw-r--r--Documentation/config/tag.txt2
-rw-r--r--Documentation/git-bisect-lk2009.txt2
-rw-r--r--Documentation/git-check-attr.txt2
-rw-r--r--Documentation/git-check-ignore.txt2
-rw-r--r--Documentation/git-cvsserver.txt2
-rw-r--r--Documentation/git-fast-export.txt2
-rw-r--r--Documentation/git-filter-branch.txt2
-rw-r--r--Documentation/git-range-diff.txt2
-rw-r--r--Documentation/git-tag.txt2
-rw-r--r--Documentation/git-update-index.txt2
-rw-r--r--Documentation/git.txt4
-rw-r--r--Documentation/gitattributes.txt6
-rw-r--r--Documentation/gitmodules.txt2
-rw-r--r--Documentation/howto/separating-topic-branches.txt2
-rw-r--r--Documentation/merge-options.txt2
-rw-r--r--Documentation/technical/api-submodule-config.txt2
-rw-r--r--Documentation/technical/api-trace2.txt14
-rw-r--r--Documentation/technical/commit-graph.txt12
-rw-r--r--Documentation/technical/hash-function-transition.txt4
-rw-r--r--Documentation/technical/index-format.txt4
-rw-r--r--Documentation/technical/pack-protocol.txt2
-rw-r--r--Documentation/technical/partial-clone.txt2
-rw-r--r--Documentation/technical/protocol-v2.txt2
-rw-r--r--Documentation/technical/rerere.txt2
-rw-r--r--INSTALL2
-rw-r--r--apply.c4
-rw-r--r--builtin/fetch.c2
-rw-r--r--builtin/gc.c4
-rw-r--r--builtin/pack-objects.c2
-rw-r--r--commit-graph.c2
-rw-r--r--commit.h2
-rw-r--r--compat/mingw.h2
-rw-r--r--compat/nedmalloc/malloc.c.h6
-rw-r--r--compat/obstack.h2
-rw-r--r--compat/regex/regcomp.c2
-rw-r--r--compat/regex/regex.h2
-rw-r--r--compat/regex/regex_internal.c2
-rw-r--r--compat/regex/regexec.c4
-rw-r--r--compat/vcbuild/find_vs_env.bat2
-rw-r--r--configure.ac2
-rw-r--r--contrib/coccinelle/commit.cocci2
-rw-r--r--contrib/completion/git-completion.bash4
-rwxr-xr-xcontrib/hooks/multimail/git_multimail.py8
-rwxr-xr-xcontrib/hooks/multimail/post-receive.example2
-rwxr-xr-xcontrib/hooks/post-receive-email2
-rwxr-xr-xcontrib/hooks/update-paranoid2
-rw-r--r--contrib/mw-to-git/.perlcriticrc2
-rwxr-xr-xcontrib/mw-to-git/git-remote-mediawiki.perl2
-rw-r--r--contrib/mw-to-git/t/install-wiki/db_install.php2
-rwxr-xr-xcontrib/mw-to-git/t/t9360-mw-to-git-clone.sh2
-rwxr-xr-xcontrib/mw-to-git/t/test-gitmw-lib.sh2
-rwxr-xr-xcontrib/svn-fe/svnrdump_sim.py2
-rw-r--r--convert.c2
-rw-r--r--daemon.c4
-rw-r--r--diff.c4
-rw-r--r--dir.c2
-rwxr-xr-xgit-cvsimport.perl2
-rwxr-xr-xgit-send-email.perl2
-rwxr-xr-xgitweb/gitweb.perl18
-rw-r--r--hashmap.c2
-rw-r--r--hashmap.h2
-rw-r--r--help.c2
-rw-r--r--name-hash.c2
-rw-r--r--parse-options.c2
-rw-r--r--perl/Git.pm2
-rw-r--r--range-diff.h2
-rw-r--r--read-cache.c2
-rw-r--r--refs/refs-internal.h2
-rw-r--r--repository.c4
-rw-r--r--repository.h2
-rw-r--r--rerere.c2
-rw-r--r--sequencer.c6
-rw-r--r--server-info.c2
-rw-r--r--sha1dc/sha1.c2
-rw-r--r--string-list.h2
-rwxr-xr-xt/perf/bisect_regression2
-rwxr-xr-xt/t0000-basic.sh2
-rwxr-xr-xt/t0027-auto-crlf.sh2
-rwxr-xr-xt/t0500-progress-display.sh4
-rwxr-xr-xt/t1050-large.sh6
-rwxr-xr-xt/t1512-rev-parse-disambiguation.sh2
-rwxr-xr-xt/t3210-pack-refs.sh2
-rwxr-xr-xt/t3905-stash-include-untracked.sh4
-rwxr-xr-xt/t4041-diff-submodule-option.sh20
-rwxr-xr-xt/t4057-diff-combined-paths.sh2
-rw-r--r--t/t4100/t-apply-1.patch4
-rw-r--r--t/t4100/t-apply-3.patch2
-rw-r--r--t/t4100/t-apply-5.patch4
-rw-r--r--t/t4100/t-apply-7.patch2
-rwxr-xr-xt/t4205-log-pretty-formats.sh2
-rwxr-xr-xt/t4213-log-tabexpand.sh2
-rwxr-xr-xt/t5528-push-default.sh2
-rwxr-xr-xt/t5535-fetch-push-symref.sh2
-rwxr-xr-xt/t5545-push-options.sh2
-rwxr-xr-xt/t5702-protocol-v2.sh10
-rwxr-xr-xt/t6036-recursive-corner-cases.sh4
-rwxr-xr-xt/t6043-merge-rename-directories.sh6
-rwxr-xr-xt/t7004-tag.sh2
-rwxr-xr-xt/t7030-verify-tag.sh14
-rwxr-xr-xt/t7508-status.sh2
-rwxr-xr-xt/t7513-interpret-trailers.sh2
-rwxr-xr-xt/t7519-status-fsmonitor.sh2
-rwxr-xr-xt/t9001-send-email.sh2
-rwxr-xr-xt/t9301-fast-import-notes.sh2
-rwxr-xr-xt/t9350-fast-export.sh2
-rwxr-xr-xt/t9809-git-p4-client-view.sh2
-rwxr-xr-xt/t9902-completion.sh6
-rw-r--r--trace2/tr2_sid.c2
-rw-r--r--unpack-trees.c4
-rw-r--r--url.c2
-rw-r--r--xdiff-interface.h2
141 files changed, 214 insertions, 214 deletions
diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines
index f45db5b727..ed4e443a3c 100644
--- a/Documentation/CodingGuidelines
+++ b/Documentation/CodingGuidelines
@@ -75,7 +75,7 @@ For shell scripts specifically (not exhaustive):
- If you want to find out if a command is available on the user's
$PATH, you should use 'type <command>', instead of 'which <command>'.
- The output of 'which' is not machine parseable and its exit code
+ The output of 'which' is not machine parsable and its exit code
is not reliable across platforms.
- We use POSIX compliant parameter substitutions and avoid bashisms;
@@ -203,7 +203,7 @@ For C programs:
. since early 2012 with e1327023ea, we have been using an enum
definition whose last element is followed by a comma. This, like
an array initializer that ends with a trailing comma, can be used
- to reduce the patch noise when adding a new identifer at the end.
+ to reduce the patch noise when adding a new identifier at the end.