summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.cirrus.yml9
-rw-r--r--.github/workflows/check-whitespace.yml26
-rw-r--r--.github/workflows/main.yml177
-rw-r--r--Documentation/CodingGuidelines45
-rw-r--r--Documentation/MyFirstContribution.txt4
-rw-r--r--Documentation/MyFirstObjectWalk.txt4
-rw-r--r--Documentation/RelNotes/1.6.0.3.txt2
-rw-r--r--Documentation/RelNotes/1.8.4.txt2
-rw-r--r--Documentation/RelNotes/2.29.0.txt4
-rw-r--r--Documentation/RelNotes/2.33.0.txt233
-rw-r--r--Documentation/RelNotes/2.8.0.txt2
-rw-r--r--Documentation/SubmittingPatches208
-rw-r--r--Documentation/config/blame.txt2
-rw-r--r--Documentation/config/diff.txt7
-rw-r--r--Documentation/config/fetch.txt3
-rw-r--r--Documentation/config/merge.txt12
-rw-r--r--Documentation/config/pack.txt23
-rw-r--r--Documentation/config/push.txt13
-rw-r--r--Documentation/config/sendemail.txt3
-rw-r--r--Documentation/config/submodule.txt5
-rw-r--r--Documentation/diff-options.txt24
-rw-r--r--Documentation/fetch-options.txt13
-rw-r--r--Documentation/git-bundle.txt147
-rw-r--r--Documentation/git-commit.txt2
-rw-r--r--Documentation/git-config.txt28
-rw-r--r--Documentation/git-diff.txt10
-rw-r--r--Documentation/git-fetch.txt2
-rw-r--r--Documentation/git-log.txt4
-rw-r--r--Documentation/git-pack-objects.txt6
-rw-r--r--Documentation/git-pull.txt2
-rw-r--r--Documentation/git-push.txt4
-rw-r--r--Documentation/git-rebase.txt27
-rw-r--r--Documentation/git-repack.txt4
-rw-r--r--Documentation/git-worktree.txt6
-rw-r--r--Documentation/gitignore.txt11
-rw-r--r--Documentation/gittutorial.txt2
-rw-r--r--Documentation/merge-options.txt7
-rw-r--r--Documentation/merge-strategies.txt48
-rw-r--r--Documentation/rev-list-options.txt10
-rw-r--r--Documentation/technical/api-trace2.txt4
-rw-r--r--Documentation/technical/directory-rename-detection.txt14
-rw-r--r--Documentation/technical/hash-function-transition.txt2
-rw-r--r--Documentation/technical/partial-clone.txt6
-rw-r--r--Documentation/technical/protocol-v2.txt2
-rw-r--r--Documentation/user-manual.txt2
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--Makefile39
-rw-r--r--add-patch.c1
-rw-r--r--advice.h1
-rw-r--r--apply.c6
-rw-r--r--archive.c9
-rw-r--r--attr.c2
-rw-r--r--builtin/add.c7
-rw-r--r--builtin/am.c1
-rw-r--r--builtin/archive.c4
-rw-r--r--builtin/bisect--helper.c2
-rw-r--r--builtin/bugreport.c5
-rw-r--r--builtin/bundle.c74
-rw-r--r--builtin/cat-file.c10
-rw-r--r--builtin/check-ignore.c3
-rw-r--r--builtin/checkout--worker.c2
-rw-r--r--builtin/checkout.c8
-rw-r--r--builtin/clean.c6
-rw-r--r--builtin/commit-tree.c4
-rw-r--r--builtin/commit.c35
-rw-r--r--builtin/diff.c4
-rw-r--r--builtin/difftool.c5
-rw-r--r--builtin/fetch.c3
-rw-r--r--builtin/for-each-repo.c14
-rw-r--r--builtin/gc.c93
-rw-r--r--builtin/grep.c3
-rw-r--r--builtin/hash-object.c4
-rw-r--r--builtin/help.c17
-rw-r--r--builtin/index-pack.c12
-rw-r--r--builtin/log.c6
-rw-r--r--builtin/ls-files.c3
-rw-r--r--builtin/ls-remote.c2
-rw-r--r--builtin/mailsplit.c4
-rw-r--r--builtin/merge-ours.c4
-rw-r--r--builtin/merge-tree.c5
-rw-r--r--builtin/merge.c21
-rw-r--r--builtin/mktree.c2
-rw-r--r--builtin/multi-pack-index.c2
-rw-r--r--builtin/mv.c5
-rw-r--r--builtin/notes.c4
-rw-r--r--builtin/pull.c26
-rw-r--r--builtin/push.c79
-rw-r--r--builtin/rebase.c5
-rw-r--r--builtin/receive-pack.c5
-rw-r--r--builtin/rerere.c4
-rw-r--r--builtin/rev-list.c33
-rw-r--r--builtin/show-branch.c24
-rw-r--r--builtin/sparse-checkout.c10
-rw-r--r--builtin/stash.c3
-rw-r--r--builtin/submodule--helper.c424
-rw-r--r--builtin/tag.c4
-rw-r--r--builtin/update-index.c4
-rw-r--r--builtin/worktree.c21
-rw-r--r--bulk-checkin.c3
-rw-r--r--bundle.c64
-rw-r--r--bundle.h21
-rw-r--r--cache-tree.c13
-rw-r--r--cache.h10
-rw-r--r--cbtree.h2
-rwxr-xr-xci/install-dependencies.sh5
-rwxr-xr-xci/lib.sh1
-rw-r--r--combine-diff.c5
-rw-r--r--commit-graph.c15
-rw-r--r--commit.c2
-rw-r--r--compat/mingw.c21
-rw-r--r--config.c14
-rw-r--r--config.h4
-rw-r--r--config.mak.uname12
-rw-r--r--connect.c2
-rw-r--r--contrib/buildsystems/CMakeLists.txt48
-rw-r--r--contrib/coccinelle/xopen.cocci16
-rw-r--r--contrib/completion/git-completion.bash16
-rw-r--r--contrib/completion/git-completion.tcsh5
-rw-r--r--contrib/credential/osxkeychain/git-credential-osxkeychain.c1
-rw-r--r--contrib/credential/wincred/git-credential-wincred.c1
-rw-r--r--contrib/hooks/multimail/CHANGES285
-rw-r--r--contrib/hooks/multimail/CONTRIBUTING.rst60
-rw-r--r--contrib/hooks/multimail/README.Git12
-rw-r--r--contrib/hooks/multimail/README.migrate-from-post-receive-email145
-rw-r--r--contrib/hooks/multimail/README.rst774
-rw-r--r--contrib/hooks/multimail/doc/customizing-emails.rst56
-rw-r--r--contrib/hooks/multimail/doc/gerrit.rst56
-rw-r--r--contrib/hooks/multimail/doc/gitolite.rst118
-rw-r--r--contrib/hooks/multimail/doc/troubleshooting.rst78
-rwxr-xr-xcontrib/hooks/multimail/git_multimail.py4346
<