summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/main.yml230
-rw-r--r--.gitignore2
-rw-r--r--.travis.yml12
-rw-r--r--Documentation/CodingGuidelines2
-rw-r--r--Documentation/Makefile24
-rw-r--r--Documentation/MyFirstObjectWalk.txt3
-rw-r--r--Documentation/RelNotes/2.17.5.txt22
-rw-r--r--Documentation/RelNotes/2.18.4.txt5
-rw-r--r--Documentation/RelNotes/2.19.5.txt5
-rw-r--r--Documentation/RelNotes/2.20.4.txt5
-rw-r--r--Documentation/RelNotes/2.21.3.txt5
-rw-r--r--Documentation/RelNotes/2.22.4.txt5
-rw-r--r--Documentation/RelNotes/2.23.3.txt5
-rw-r--r--Documentation/RelNotes/2.24.3.txt5
-rw-r--r--Documentation/RelNotes/2.25.4.txt5
-rw-r--r--Documentation/RelNotes/2.26.2.txt5
-rw-r--r--Documentation/RelNotes/2.27.0.txt289
-rw-r--r--Documentation/asciidoc.conf19
-rw-r--r--Documentation/config.txt21
-rw-r--r--Documentation/config/fetch.txt13
-rw-r--r--Documentation/config/format.txt5
-rw-r--r--Documentation/config/log.txt6
-rw-r--r--Documentation/config/merge.txt10
-rw-r--r--Documentation/config/protocol.txt2
-rw-r--r--Documentation/config/push.txt2
-rw-r--r--Documentation/config/submodule.txt12
-rw-r--r--Documentation/config/trace2.txt9
-rw-r--r--Documentation/fetch-options.txt5
-rw-r--r--Documentation/git-am.txt5
-rw-r--r--Documentation/git-bugreport.txt52
-rw-r--r--Documentation/git-checkout.txt4
-rw-r--r--Documentation/git-cherry-pick.txt5
-rw-r--r--Documentation/git-clone.txt13
-rw-r--r--Documentation/git-commit-graph.txt22
-rw-r--r--Documentation/git-commit-tree.txt8
-rw-r--r--Documentation/git-commit.txt9
-rw-r--r--Documentation/git-format-patch.txt8
-rw-r--r--Documentation/git-grep.txt8
-rw-r--r--Documentation/git-log.txt6
-rw-r--r--Documentation/git-ls-files.txt2
-rw-r--r--Documentation/git-merge.txt11
-rw-r--r--Documentation/git-p4.txt45
-rw-r--r--Documentation/git-pull.txt20
-rw-r--r--Documentation/git-read-tree.txt4
-rw-r--r--Documentation/git-rebase.txt101
-rw-r--r--Documentation/git-reset.txt6
-rw-r--r--Documentation/git-restore.txt11
-rw-r--r--Documentation/git-revert.txt5
-rw-r--r--Documentation/git-sparse-checkout.txt10
-rw-r--r--Documentation/git-switch.txt4
-rw-r--r--Documentation/git-update-ref.txt28
-rw-r--r--Documentation/gitfaq.txt337
-rw-r--r--Documentation/githooks.txt51
-rw-r--r--Documentation/gitsubmodules.txt3
-rw-r--r--Documentation/manpage-1.72.xsl14
-rw-r--r--Documentation/manpage-base.xsl35
-rw-r--r--Documentation/manpage-bold-literal.xsl6
-rw-r--r--Documentation/manpage-normal.xsl25
-rw-r--r--Documentation/manpage-suppress-sp.xsl21
-rw-r--r--Documentation/merge-options.txt13
-rw-r--r--Documentation/pretty-formats.txt6
-rw-r--r--Documentation/pull-fetch-param.txt3
-rw-r--r--Documentation/rev-list-options.txt134
-rw-r--r--Documentation/revisions.txt2
-rw-r--r--Documentation/technical/api-trace2.txt3
-rw-r--r--Documentation/technical/commit-graph-format.txt30
-rw-r--r--Documentation/user-manual.conf10
-rw-r--r--INSTALL4
-rw-r--r--Makefile121
-rw-r--r--README.md2
-rw-r--r--add-interactive.c4
-rw-r--r--add-patch.c4
-rw-r--r--archive-tar.c4
-rw-r--r--azure-pipelines.yml558
-rw-r--r--bisect.c8
-rw-r--r--blame.c137
-rw-r--r--blame.h6
-rw-r--r--bloom.c276
-rw-r--r--bloom.h90
-rw-r--r--branch.c1
-rw-r--r--bugreport.c140
-rw-r--r--builtin.h16
-rw-r--r--builtin/blame.c10
-rw-r--r--builtin/cat-file.c2
-rw-r--r--builtin/clean.c20
-rw-r--r--builtin/clone.c13
-rw-r--r--builtin/commit-graph.c60
-rw-r--r--builtin/commit.c6
-rw-r--r--builtin/diff-tree.c9
-rw-r--r--builtin/diff.c2
-rw-r--r--builtin/fetch-pack.c2
-rw-r--r--builtin/fetch.c7
-rw-r--r--builtin/fmt-merge-msg.c658
-rw-r--r--builtin/grep.c48
-rw-r--r--builtin/help.c88
-rw-r--r--builtin/index-pack.c5
-rw-r--r--builtin/log.c24
-rw-r--r--builtin/ls-files.c5
-rw-r--r--builtin/merge.c40
-rw-r--r--builtin/pack-objects.c2
-rw-r--r--builtin/prune-packed.c44
-rw-r--r--builtin/prune.c1
-rw-r--r--builtin/pull.c34
-rw-r--r--builtin/push.c6
-rw-r--r--builtin/rebase.c343
-rw-r--r--builtin/receive-pack.c29
-rw-r--r--builtin/reflog.c2
-rw-r--r--builtin/repack.c1
-rw-r--r--builtin/send-pack.c2
-rw-r--r--builtin/sparse-checkout.c55
-rw-r--r--builtin/stash.c19
-rw-r--r--builtin/tag.c2
-rw-r--r--builtin/update-ref.c245
-rw-r--r--cache.h2
-rw-r--r--ci/git-problem-matcher.json16
-rwxr-xr-xci/install-dependencies.sh16
-rwxr-xr-xci/install-docker-dependencies.sh18
-rwxr-xr-xci/lib.sh39
-rwxr-xr-xci/print-test-failures.sh7
-rwxr-xr-xci/run-build-and-tests.sh1
-rwxr-xr-xci/run-docker-build.sh (renamed from ci/run-linux32-build.sh)39
-rwxr-xr-xci/run-docker.sh47
-rwxr-xr-xci/run-linux32-docker.sh31
-rw-r--r--combine-diff.c2
-rw-r--r--command-list.txt1
-rw-r--r--commit-graph.c379
-rw-r--r--commit-graph.h33
-rw-r--r--commit.h2
-rw-r--r--compat/compiler.h41
-rw-r--r--compat/mingw.c62
-rw-r--r--compat/regex/regex.c