summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/main.yml177
-rw-r--r--Documentation/MyFirstContribution.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.txt142
-rw-r--r--Documentation/RelNotes/2.8.0.txt2
-rw-r--r--Documentation/SubmittingPatches5
-rw-r--r--Documentation/config/blame.txt2
-rw-r--r--Documentation/config/fetch.txt3
-rw-r--r--Documentation/config/merge.txt2
-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/fetch-options.txt13
-rw-r--r--Documentation/git-commit.txt2
-rw-r--r--Documentation/git-diff.txt10
-rw-r--r--Documentation/git-log.txt4
-rw-r--r--Documentation/git-pack-objects.txt6
-rw-r--r--Documentation/git-push.txt4
-rw-r--r--Documentation/git-repack.txt4
-rw-r--r--Documentation/git-worktree.txt6
-rw-r--r--Documentation/gitignore.txt11
-rw-r--r--Documentation/rev-list-options.txt10
-rw-r--r--Documentation/technical/api-trace2.txt4
-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
-rw-r--r--Makefile45
-rw-r--r--add-patch.c1
-rw-r--r--advice.h1
-rw-r--r--apply.c6
-rw-r--r--archive.c2
-rw-r--r--attr.c2
-rw-r--r--builtin/add.c3
-rw-r--r--builtin/am.c1
-rw-r--r--builtin/bisect--helper.c2
-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/clean.c6
-rw-r--r--builtin/commit.c29
-rw-r--r--builtin/diff.c4
-rw-r--r--builtin/difftool.c5
-rw-r--r--builtin/fetch.c3
-rw-r--r--builtin/grep.c3
-rw-r--r--builtin/help.c17
-rw-r--r--builtin/index-pack.c4
-rw-r--r--builtin/log.c6
-rw-r--r--builtin/ls-files.c3
-rw-r--r--builtin/merge-ours.c4
-rw-r--r--builtin/merge-tree.c5
-rw-r--r--builtin/mktree.c2
-rw-r--r--builtin/pull.c26
-rw-r--r--builtin/push.c79
-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.c9
-rw-r--r--builtin/stash.c3
-rw-r--r--builtin/submodule--helper.c1
-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.h1
-rw-r--r--cbtree.c167
-rw-r--r--cbtree.h56
-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--config.c14
-rw-r--r--config.h4
-rw-r--r--config.mak.uname12
-rw-r--r--contrib/buildsystems/CMakeLists.txt48
-rw-r--r--contrib/completion/git-completion.bash2
-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
-rwxr-xr-xcontrib/hooks/multimail/migrate-mailhook-config274
-rwxr-xr-xcontrib/hooks/multimail/post-receive.example101
-rwxr-xr-xcontrib/mw-to-git/t/t9360-mw-to-git-clone.sh2
-rwxr-xr-xcontrib/mw-to-git/t/t9362-mw-to-git-utf8.sh4
-rwxr-xr-xcontrib/subtree/git-subtree.sh12
-rw-r--r--credential.c4
-rw-r--r--credential.h4
-rw-r--r--csum-file.c16
-rw-r--r--csum-file.h3
-rw-r--r--date.c2
-rw-r--r--diff.c39
-rw-r--r--diff.h7
-rw-r--r--diffcore-pickaxe.c106
-rw-r--r--diffcore-rename.c153
-rw-r--r--dir.c19
-rw-r--r--dir.h6
-rw-r--r--entry.c4
-rw-r--r--gettext.c1
-rw-r--r--git-compat-util.h3
-rwxr-xr-xgit-cvsserver.perl2
-rwxr-xr-xgit-p4.py7
-rwxr-xr-xgit-send-email.perl174
-rwxr-xr-xgit-submodule.sh14
-rw-r--r--graph.c2
-rw-r--r--grep.c2
-rw-r--r--hash.h2
-rw-r--r--imap-send.c19
-rw-r--r--json-writer.c6
-rw-r--r--json-writer.h5
-rw-r--r--khash.h14
-rw-r--r--list-objects.c3
-rw-r--r--ll-merge.c10
-rw-r--r--log-tree.c24
-rw-r--r--mailinfo.c4
-rw-r--r--mailmap.c1
-rw-r--r--merge-ort.c141
-rw-r--r--merge-recursive.c26
-rw-r--r--merge.c3
-rw-r--r--mergetools/kdiff39
-rw-r--r--midx.c14</