summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.editorconfig2
-rw-r--r--.mailmap4
-rw-r--r--.tsan-suppressions6
-rw-r--r--Documentation/MyFirstContribution.txt36
-rw-r--r--Documentation/RelNotes/2.25.1.txt55
-rw-r--r--Documentation/RelNotes/2.25.2.txt60
-rw-r--r--Documentation/RelNotes/2.26.0.txt341
-rw-r--r--Documentation/config.txt4
-rw-r--r--Documentation/config/advice.txt6
-rw-r--r--Documentation/config/branch.txt7
-rw-r--r--Documentation/config/core.txt11
-rw-r--r--Documentation/config/gpg.txt15
-rw-r--r--Documentation/config/http.txt33
-rw-r--r--Documentation/config/pack.txt7
-rw-r--r--Documentation/config/protocol.txt9
-rw-r--r--Documentation/config/pull.txt7
-rw-r--r--Documentation/config/push.txt9
-rw-r--r--Documentation/config/rebase.txt6
-rw-r--r--Documentation/config/user.txt7
-rw-r--r--Documentation/diff-options.txt8
-rwxr-xr-xDocumentation/doc-diff2
-rw-r--r--Documentation/fetch-options.txt5
-rw-r--r--Documentation/git-am.txt10
-rw-r--r--Documentation/git-check-ignore.txt12
-rw-r--r--Documentation/git-commit-graph.txt5
-rw-r--r--Documentation/git-commit-tree.txt22
-rw-r--r--Documentation/git-commit.txt40
-rw-r--r--Documentation/git-config.txt15
-rw-r--r--Documentation/git-filter-branch.txt6
-rw-r--r--Documentation/git-grep.txt18
-rw-r--r--Documentation/git-ls-remote.txt4
-rw-r--r--Documentation/git-rebase.txt180
-rw-r--r--Documentation/git-rm.txt61
-rw-r--r--Documentation/git-sparse-checkout.txt30
-rw-r--r--Documentation/git-stash.txt144
-rw-r--r--Documentation/git-submodule.txt8
-rw-r--r--Documentation/git-update-index.txt16
-rw-r--r--Documentation/git.txt47
-rw-r--r--Documentation/gitcli.txt5
-rw-r--r--Documentation/gitcore-tutorial.txt2
-rw-r--r--Documentation/gitcredentials.txt93
-rw-r--r--Documentation/githooks.txt13
-rw-r--r--Documentation/pretty-formats.txt1
-rw-r--r--Documentation/technical/bundle-format.txt48
-rw-r--r--Documentation/technical/pack-format.txt5
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--Makefile6
l---------RelNotes2
-rw-r--r--add-interactive.c30
-rw-r--r--add-interactive.h16
-rw-r--r--add-patch.c413
-rw-r--r--advice.c101
-rw-r--r--advice.h54
-rw-r--r--apply.c6
-rw-r--r--archive-tar.c6
-rw-r--r--archive-zip.c3
-rw-r--r--azure-pipelines.yml37
-rw-r--r--bisect.c135
-rw-r--r--bisect.h29
-rw-r--r--blame.h4
-rw-r--r--builtin/add.c45
-rw-r--r--builtin/am.c96
-rw-r--r--builtin/bisect--helper.c123
-rw-r--r--builtin/cat-file.c2
-rw-r--r--builtin/check-ignore.c3
-rw-r--r--builtin/checkout.c75
-rw-r--r--builtin/clone.c12
-rw-r--r--builtin/commit-graph.c35
-rw-r--r--builtin/commit.c11
-rw-r--r--builtin/config.c46
-rw-r--r--builtin/describe.c22
-rw-r--r--builtin/fast-export.c6
-rw-r--r--builtin/fetch.c23
-rw-r--r--builtin/fmt-merge-msg.c11
-rw-r--r--builtin/gc.c2
-rw-r--r--builtin/grep.c96
-rw-r--r--builtin/index-pack.c14
-rw-r--r--builtin/merge.c9
-rw-r--r--builtin/mktag.c7
-rw-r--r--builtin/name-rev.c191
-rw-r--r--builtin/notes.c4
-rw-r--r--builtin/pack-objects.c292
-rw-r--r--builtin/pull.c42
-rw-r--r--builtin/rebase.c290
-rw-r--r--builtin/receive-pack.c36
-rw-r--r--builtin/reflog.c9
-rw-r--r--builtin/remote.c189
-rw-r--r--builtin/replace.c3
-rw-r--r--builtin/rev-list.c121
-rw-r--r--builtin/rm.c28
-rw-r--r--builtin/show-branch.c2
-rw-r--r--builtin/sparse-checkout.c191
-rw-r--r--builtin/stash.c104
-rw-r--r--builtin/submodule--helper.c43
-rw-r--r--builtin/tag.c5
-rw-r--r--builtin/unpack-objects.c3
-rw-r--r--builtin/worktree.c9
-rw-r--r--cache-tree.c11
-rw-r--r--cache.h5
-rwxr-xr-xci/install-dependencies.sh4
-rwxr-xr-xci/run-build-and-tests.sh1
-rwxr-xr-xci/test-documentation.sh1
-rw-r--r--color.c75
-rw-r--r--commit-graph.c123
-rw-r--r--commit-graph.h15
-rw-r--r--commit.c14
-rw-r--r--commit.h12
-rw-r--r--compat/mingw.c15
-rw-r--r--compat/mingw.h10
-rw-r--r--compat/obstack.h6
-rw-r--r--compat/poll/poll.c31
-rw-r--r--compat/regex/regex.h5
-rw-r--r--compat/terminal.c249
-rw-r--r--compat/terminal.h3
-rwxr-xr-xcompat/vcbuild/scripts/clink.pl4
-rw-r--r--config.c45
-rw-r--r--config.h21
-rw-r--r--config.mak.dev1
-rw-r--r--connected.c19
-rw-r--r--connected.h11
-rwxr-xr-xcontrib/buildsystems/engine.pl4
-rw-r--r--contrib/completion/git-completion.bash160
-rw-r--r--contrib/completion/git-prompt.sh6
-rw-r--r--contrib/credential/netrc/.gitignore1
-rw-r--r--contrib/credential/netrc/Makefile26
-rwxr-xr-xcontrib/credential/netrc/git-credential-netrc.perl (renamed from contrib/credential/netrc/git-credential-netrc)2
-rw-r--r--convert.c4
-rw-r--r--credential.c75
-rw-r--r--credential.h93
-rw-r--r--csum-file.h9
-rw-r--r--diff.c18
-rw-r--r--diffcore-rename.c4