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--.gitignore6
-rw-r--r--.travis.yml10
-rw-r--r--Documentation/.gitignore2
-rw-r--r--Documentation/CodingGuidelines13
-rw-r--r--Documentation/Makefile30
-rw-r--r--Documentation/RelNotes/2.22.0.txt597
-rw-r--r--Documentation/RelNotes/2.23.0.txt77
-rw-r--r--Documentation/SubmittingPatches6
-rw-r--r--Documentation/asciidoctor-extensions.rb4
-rw-r--r--Documentation/config.txt2
-rw-r--r--Documentation/config/advice.txt2
-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/format.txt15
-rw-r--r--Documentation/config/fsck.txt6
-rw-r--r--Documentation/config/gc.txt40
-rw-r--r--Documentation/config/gpg.txt2
-rw-r--r--Documentation/config/merge.txt19
-rw-r--r--Documentation/config/pack.txt4
-rw-r--r--Documentation/config/pull.txt6
-rw-r--r--Documentation/config/rebase.txt17
-rw-r--r--Documentation/config/repack.txt2
-rw-r--r--Documentation/config/stash.txt15
-rw-r--r--Documentation/config/trace2.txt56
-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/fetch-options.txt3
-rw-r--r--Documentation/git-add.txt9
-rw-r--r--Documentation/git-am.txt5
-rw-r--r--Documentation/git-branch.txt12
-rw-r--r--Documentation/git-checkout.txt16
-rw-r--r--Documentation/git-cherry-pick.txt12
-rw-r--r--Documentation/git-clean.txt11
-rw-r--r--Documentation/git-clone.txt8
-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-describe.txt2
-rw-r--r--Documentation/git-diff-tree.txt12
-rw-r--r--Documentation/git-difftool.txt4
-rw-r--r--Documentation/git-fast-export.txt7
-rw-r--r--Documentation/git-fast-import.txt36
-rw-r--r--Documentation/git-filter-branch.txt2
-rw-r--r--Documentation/git-format-patch.txt7
-rw-r--r--Documentation/git-fsck.txt14
-rw-r--r--Documentation/git-gc.txt144
-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-interpret-trailers.txt2
-rw-r--r--Documentation/git-ls-files.txt2
-rw-r--r--Documentation/git-ls-remote.txt2
-rw-r--r--Documentation/git-ls-tree.txt4
-rw-r--r--Documentation/git-merge.txt7
-rw-r--r--Documentation/git-mergetool--lib.txt4
-rw-r--r--Documentation/git-mergetool.txt4
-rw-r--r--Documentation/git-notes.txt2
-rw-r--r--Documentation/git-pull.txt5
-rw-r--r--Documentation/git-read-tree.txt9
-rw-r--r--Documentation/git-rebase.txt35
-rw-r--r--Documentation/git-remote-ext.txt4
-rw-r--r--Documentation/git-remote-fd.txt2
-rw-r--r--Documentation/git-remote-helpers.txto2
-rw-r--r--Documentation/git-remote-testgit.txt30
-rw-r--r--Documentation/git-rerere.txt2
-rw-r--r--Documentation/git-reset.txt4
-rw-r--r--Documentation/git-revert.txt12
-rw-r--r--Documentation/git-send-email.txt8
-rw-r--r--Documentation/git-show-branch.txt2
-rw-r--r--Documentation/git-stash.txt4
-rw-r--r--Documentation/git-status.txt12
-rw-r--r--Documentation/git-submodule.txt20
-rw-r--r--Documentation/git-svn.txt16
-rw-r--r--Documentation/git-update-server-info.txt11
-rw-r--r--Documentation/git-web--browse.txt4
-rw-r--r--Documentation/git-worktree.txt2
-rw-r--r--Documentation/git.txt49
-rw-r--r--Documentation/gitattributes.txt8
-rw-r--r--Documentation/githooks.txt22
-rw-r--r--Documentation/gitignore.txt8
-rw-r--r--Documentation/gitk.txt8
-rw-r--r--Documentation/gitmodules.txt2
-rw-r--r--Documentation/gitremote-helpers.txt6
-rw-r--r--Documentation/gitrepository-layout.txt2
-rw-r--r--Documentation/gitsubmodules.txt14
-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.txt18
-rw-r--r--Documentation/pretty-formats.txt264
-rw-r--r--Documentation/rev-list-options.txt38
-rw-r--r--Documentation/revisions.txt33
-rw-r--r--Documentation/sequencer.txt2
-rw-r--r--Documentation/technical/api-config.txt2
-rw-r--r--Documentation/technical/api-parse-options.txt4
-rw-r--r--Documentation/technical/api-trace2.txt1378
-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
-rw-r--r--Documentation/technical/protocol-v2.txt52
-rw-r--r--Documentation/trace2-target-values.txt10
-rw-r--r--Documentation/urls.txt2
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--Makefile194
l---------RelNotes2
-rw-r--r--advice.c2
-rw-r--r--advice.h3
-rw-r--r--apply.c4
-rw-r--r--archive-tar.c7
-rw-r--r--archive-zip.c10
-rw-r--r--archive.c10
-rw-r--r--archive.h26
-rw-r--r--attr.c8
-rw-r--r--bisect.c19
-rw-r--r--bisect.h26
-rw-r--r--blame.c8
-rw-r--r--blame.h4
-rw-r--r--branch.c13
-rw-r--r--branch.h20
-rw-r--r--builtin.h254
-rw-r--r--