summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.clang-format2
-rw-r--r--.github/CONTRIBUTING.md2
-rw-r--r--.github/PULL_REQUEST_TEMPLATE.md4
-rw-r--r--.gitignore2
-rw-r--r--.travis.yml10
-rw-r--r--Documentation/.gitignore1
-rw-r--r--Documentation/CodingGuidelines7
-rw-r--r--Documentation/Makefile25
-rw-r--r--Documentation/RelNotes/2.22.0.txt247
-rw-r--r--Documentation/SubmittingPatches6
-rw-r--r--Documentation/asciidoctor-extensions.rb4
-rw-r--r--Documentation/config/branch.txt6
-rw-r--r--Documentation/config/core.txt14
-rw-r--r--Documentation/config/diff.txt4
-rw-r--r--Documentation/config/fsck.txt6
-rw-r--r--Documentation/config/gc.txt2
-rw-r--r--Documentation/config/gpg.txt2
-rw-r--r--Documentation/config/pull.txt6
-rw-r--r--Documentation/config/rebase.txt17
-rw-r--r--Documentation/config/user.txt23
-rw-r--r--Documentation/diff-format.txt20
-rw-r--r--Documentation/diff-generate-patch.txt13
-rw-r--r--Documentation/diff-options.txt24
-rwxr-xr-xDocumentation/doc-diff86
-rw-r--r--Documentation/git-add.txt9
-rw-r--r--Documentation/git-am.txt5
-rw-r--r--Documentation/git-branch.txt6
-rw-r--r--Documentation/git-checkout.txt12
-rw-r--r--Documentation/git-cherry-pick.txt5
-rw-r--r--Documentation/git-clean.txt11
-rw-r--r--Documentation/git-commit-tree.txt9
-rw-r--r--Documentation/git-config.txt6
-rw-r--r--Documentation/git-daemon.txt2
-rw-r--r--Documentation/git-diff-tree.txt11
-rw-r--r--Documentation/git-filter-branch.txt2
-rw-r--r--Documentation/git-fsck.txt14
-rw-r--r--Documentation/git-gc.txt2
-rw-r--r--Documentation/git-grep.txt2
-rw-r--r--Documentation/git-help.txt4
-rw-r--r--Documentation/git-http-backend.txt2
-rw-r--r--Documentation/git-ls-remote.txt2
-rw-r--r--Documentation/git-ls-tree.txt4
-rw-r--r--Documentation/git-merge.txt3
-rw-r--r--Documentation/git-notes.txt2
-rw-r--r--Documentation/git-rebase.txt30
-rw-r--r--Documentation/git-remote-ext.txt2
-rw-r--r--Documentation/git-reset.txt4
-rw-r--r--Documentation/git-revert.txt5
-rw-r--r--Documentation/git-stash.txt4
-rw-r--r--Documentation/git-submodule.txt6
-rw-r--r--Documentation/git-svn.txt10
-rw-r--r--Documentation/git-web--browse.txt4
-rw-r--r--Documentation/git-worktree.txt2
-rw-r--r--Documentation/git.txt1
-rw-r--r--Documentation/gitattributes.txt8
-rw-r--r--Documentation/githooks.txt4
-rw-r--r--Documentation/gitignore.txt8
-rw-r--r--Documentation/gitk.txt8
-rw-r--r--Documentation/gitmodules.txt2
-rw-r--r--Documentation/gitremote-helpers.txt2
-rw-r--r--Documentation/gitrepository-layout.txt2
-rw-r--r--Documentation/gitweb.conf.txt32
-rw-r--r--Documentation/gitweb.txt38
-rw-r--r--Documentation/glossary-content.txt9
-rw-r--r--Documentation/howto/setup-git-server-over-http.txt4
-rw-r--r--Documentation/merge-options.txt11
-rw-r--r--Documentation/pretty-formats.txt264
-rw-r--r--Documentation/rev-list-options.txt9
-rw-r--r--Documentation/revisions.txt4
-rw-r--r--Documentation/sequencer.txt2
-rw-r--r--Documentation/technical/api-trace2.txt1349
-rw-r--r--Documentation/technical/directory-rename-detection.txt4
-rw-r--r--Documentation/technical/pack-protocol.txt8
-rw-r--r--Documentation/technical/protocol-capabilities.txt18
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--Makefile93
l---------RelNotes2
-rw-r--r--apply.c4
-rw-r--r--attr.c8
-rw-r--r--bisect.c19
-rw-r--r--blame.c3
-rw-r--r--builtin.h1
-rw-r--r--builtin/am.c6
-rw-r--r--builtin/blame.c2
-rw-r--r--builtin/branch.c25
-rw-r--r--builtin/checkout.c143
-rw-r--r--builtin/commit-tree.c158
-rw-r--r--builtin/commit.c11
-rw-r--r--builtin/diff-tree.c6
-rw-r--r--builtin/diff.c20
-rw-r--r--builtin/fetch.c2
-rw-r--r--builtin/fsck.c62
-rw-r--r--builtin/help.c4
-rw-r--r--builtin/init-db.c10
-rw-r--r--builtin/log.c50
-rw-r--r--builtin/merge.c9
-rw-r--r--builtin/multi-pack-index.c3
-rw-r--r--builtin/pack-objects.c16
-rw-r--r--builtin/pack-redundant.c232
-rw-r--r--builtin/prune-packed.c5
-rw-r--r--builtin/prune.c44
-rw-r--r--builtin/pull.c4
-rw-r--r--builtin/rebase.c113
-rw-r--r--builtin/receive-pack.c27
-rw-r--r--builtin/replace.c4
-rw-r--r--builtin/reset.c6
-rw-r--r--builtin/rev-list.c2
-rw-r--r--builtin/stash.c1648
-rw-r--r--builtin/submodule--helper.c9
-rw-r--r--builtin/update-index.c41
-rw-r--r--builtin/worktree.c13
-rw-r--r--cache.h57
-rw-r--r--check-racy.c28
-rwxr-xr-xci/run-windows-build.sh103
-rw-r--r--combine-diff.c76
-rw-r--r--common-main.c13
-rw-r--r--compat/bswap.h5
-rw-r--r--compat/mingw.c11
-rw-r--r--compat/mingw.h3
-rw-r--r--compat/win32/trace2_win32_process_info.c147
-rw-r--r--config.c8
-rw-r--r--config.mak.dev44
-rw-r--r--config.mak.uname3
-rw-r--r--connect.c3
-rw-r--r--contrib/completion/git-completion.bash53
-rwxr-xr-xcontrib/subtree/git-subtree.sh24
-rw-r--r--convert.c2
-rw-r--r--date.c4
-rw-r--r--diff-lib.c2
-rw-r--r--diff-no-index.c8
-rw-r--r--diff.