summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.editorconfig2
-rw-r--r--.mailmap3
-rw-r--r--.tsan-suppressions6
-rw-r--r--Documentation/RelNotes/2.26.0.txt175
-rw-r--r--Documentation/config/advice.txt6
-rw-r--r--Documentation/config/gpg.txt15
-rw-r--r--Documentation/config/http.txt12
-rw-r--r--Documentation/config/pack.txt7
-rw-r--r--Documentation/config/protocol.txt9
-rw-r--r--Documentation/config/push.txt5
-rw-r--r--Documentation/config/user.txt7
-rw-r--r--Documentation/diff-options.txt8
-rw-r--r--Documentation/fetch-options.txt5
-rw-r--r--Documentation/git-commit-tree.txt22
-rw-r--r--Documentation/git-commit.txt40
-rw-r--r--Documentation/git-filter-branch.txt6
-rw-r--r--Documentation/git-grep.txt18
-rw-r--r--Documentation/git-sparse-checkout.txt4
-rw-r--r--Documentation/git-submodule.txt2
-rw-r--r--Documentation/git-update-index.txt16
-rw-r--r--Documentation/git.txt47
-rw-r--r--Documentation/gitcore-tutorial.txt2
-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--Makefile4
l---------RelNotes2
-rw-r--r--add-interactive.c30
-rw-r--r--add-interactive.h16
-rw-r--r--add-patch.c413
-rw-r--r--advice.c4
-rw-r--r--advice.h2
-rw-r--r--builtin/add.c45
-rw-r--r--builtin/checkout.c73
-rw-r--r--builtin/commit.c9
-rw-r--r--builtin/fast-export.c3
-rw-r--r--builtin/grep.c96
-rw-r--r--builtin/merge.c9
-rw-r--r--builtin/pack-objects.c243
-rw-r--r--builtin/pull.c13
-rw-r--r--builtin/reflog.c9
-rw-r--r--builtin/stash.c25
-rwxr-xr-xci/run-build-and-tests.sh1
-rwxr-xr-xci/test-documentation.sh1
-rw-r--r--commit.c12
-rw-r--r--commit.h12
-rw-r--r--compat/obstack.h6
-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
-rwxr-xr-xcontrib/buildsystems/engine.pl4
-rw-r--r--contrib/completion/git-completion.bash140
-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.c2
-rw-r--r--csum-file.h9
-rw-r--r--dir.c83
-rw-r--r--ewah/bitmap.c13
-rw-r--r--ewah/ewok.h1
-rwxr-xr-xgit-legacy-stash.sh2
-rwxr-xr-xgit-submodule.sh14
-rw-r--r--gpg-interface.c91
-rw-r--r--gpg-interface.h10
-rw-r--r--graph.c10
-rw-r--r--grep.c32
-rw-r--r--grep.h13
-rw-r--r--merge-recursive.c18
-rw-r--r--notes.c6
-rw-r--r--object-store.h47
-rw-r--r--object.c2
-rw-r--r--pack-bitmap.c192
-rw-r--r--pack-bitmap.h6
-rw-r--r--packfile.c44
-rw-r--r--packfile.h3
-rw-r--r--parse-options.c7
-rw-r--r--pretty.c30
-rw-r--r--protocol.c11
-rw-r--r--refs/files-backend.c3
-rw-r--r--remote-curl.c5
-rw-r--r--replace-object.c11
-rw-r--r--replace-object.h7
-rw-r--r--run-command.c3
-rw-r--r--sequencer.c6
-rw-r--r--setup.c23
-rw-r--r--sha1-file.c95
-rw-r--r--sha1-name.c9
-rw-r--r--string-list.h6
-rw-r--r--submodule-config.c18
-rw-r--r--submodule-config.h2
-rw-r--r--submodule.c57
-rw-r--r--t/README4
-rwxr-xr-xt/check-non-portable-shell.pl2
-rw-r--r--t/helper/test-parse-pathspec-file.c33
-rw-r--r--t/helper/test-tool.c1
-rw-r--r--t/helper/test-tool.h1
-rw-r--r--t/lib-git-p4.sh2
-rwxr-xr-xt/t0000-basic.sh14
-rwxr-xr-xt/t0003-attributes.sh47
-rwxr-xr-xt/t0020-crlf.sh18
-rwxr-xr-xt/t0040-parse-options.sh4
-rwxr-xr-xt/t0067-parse_pathspec_file.sh108
-rwxr-xr-xt/t1306-xdg-files.sh8
-rwxr-xr-xt/t1307-config-blob.sh2
-rwxr-xr-xt/t1409-avoid-packing-refs.sh16
-rwxr-xr-xt/t1501-work-tree.sh2
-rwxr-xr-xt/t1506-rev-parse-diagnosis.sh14
-rwxr-xr-xt/t1507-rev-parse-upstream.sh104
-rwxr-xr-xt/t2024-checkout-dwim.sh28
-rwxr-xr-xt/t2026-checkout-pathspec-file.sh28
-rwxr-xr-xt/t2070-restore.sh17
-rwxr-xr-xt/t2072-restore-pathspec-file.sh29
-rwxr-xr-xt/t2405-worktree-submodule.sh90
-rwxr-xr-xt/t3600-rm.sh7
-rwxr-xr-xt/t3700-add.sh4
-rwxr-xr-xt/t3701-add-interactive.sh11
-rwxr-xr-xt/t3704-add-pathspec-file.sh36
-rwxr-xr-xt/t4018-diff-funcname.sh1
-rwxr-xr-xt/t4054-diff-bogus-tree.sh3
-rwxr-xr-xt/t4066-diff-emit-delay.sh10
-rwxr-xr-xt/t4134-apply-submodule.sh5
-rwxr-xr-xt/t4200-rerere.sh3
-rwxr-xr-xt/t4202-log.sh127
-rwxr-xr-xt/t4204-patch-id.sh2
-rwxr-xr-xt/t4215-log-skewed-merges.sh62
-rwxr-xr-xt/t4300-merge-tree.sh188
-rwxr-xr-xt/t5318-commit-graph.sh2
-rwxr-xr-xt/t5319-multi-pack-index.sh26
-rwxr-xr-xt/t5324-split-commit-graph.sh13
-rwxr-xr-xt/t5400-send-pack.sh2
-rwxr-xr-x