summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.clang-format2
-rw-r--r--.gitattributes6
-rw-r--r--.gitignore3
-rw-r--r--.mailmap4
-rw-r--r--.travis.yml10
-rw-r--r--Documentation/CodingGuidelines5
-rw-r--r--Documentation/Makefile4
-rw-r--r--Documentation/RelNotes/2.13.7.txt20
-rw-r--r--Documentation/RelNotes/2.14.4.txt5
-rw-r--r--Documentation/RelNotes/2.15.2.txt3
-rw-r--r--Documentation/RelNotes/2.16.2.txt30
-rw-r--r--Documentation/RelNotes/2.16.3.txt49
-rw-r--r--Documentation/RelNotes/2.16.4.txt5
-rw-r--r--Documentation/RelNotes/2.17.0.txt398
-rw-r--r--Documentation/RelNotes/2.17.1.txt16
-rw-r--r--Documentation/RelNotes/2.18.0.txt413
-rw-r--r--Documentation/SubmittingPatches4
-rw-r--r--Documentation/config.txt102
-rw-r--r--Documentation/diff-config.txt3
-rw-r--r--Documentation/diff-options.txt22
-rw-r--r--Documentation/fetch-options.txt25
-rw-r--r--Documentation/git-add.txt4
-rw-r--r--Documentation/git-am.txt10
-rw-r--r--Documentation/git-apply.txt10
-rw-r--r--Documentation/git-bisect.txt4
-rw-r--r--Documentation/git-branch.txt4
-rw-r--r--Documentation/git-bundle.txt4
-rw-r--r--Documentation/git-cat-file.txt7
-rw-r--r--Documentation/git-clone.txt4
-rw-r--r--Documentation/git-commit-graph.txt94
-rw-r--r--Documentation/git-commit.txt2
-rw-r--r--Documentation/git-config.txt87
-rw-r--r--Documentation/git-cvsserver.txt10
-rw-r--r--Documentation/git-daemon.txt28
-rw-r--r--Documentation/git-diff-index.txt6
-rw-r--r--Documentation/git-diff-tree.txt2
-rw-r--r--Documentation/git-diff.txt16
-rw-r--r--Documentation/git-fast-export.txt2
-rw-r--r--Documentation/git-fast-import.txt22
-rw-r--r--Documentation/git-fetch-pack.txt2
-rw-r--r--Documentation/git-fetch.txt87
-rw-r--r--Documentation/git-filter-branch.txt16
-rw-r--r--Documentation/git-fmt-merge-msg.txt4
-rw-r--r--Documentation/git-for-each-ref.txt2
-rw-r--r--Documentation/git-format-patch.txt2
-rw-r--r--Documentation/git-gc.txt53
-rw-r--r--Documentation/git-grep.txt2
-rw-r--r--Documentation/git-http-fetch.txt13
-rw-r--r--Documentation/git-http-push.txt2
-rw-r--r--Documentation/git-imap-send.txt4
-rw-r--r--Documentation/git-index-pack.txt7
-rw-r--r--Documentation/git-interpret-trailers.txt2
-rw-r--r--Documentation/git-log.txt8
-rw-r--r--Documentation/git-ls-files.txt7
-rw-r--r--Documentation/git-ls-remote.txt24
-rw-r--r--Documentation/git-mktree.txt2
-rw-r--r--Documentation/git-name-rev.txt4
-rw-r--r--Documentation/git-p4.txt4
-rw-r--r--Documentation/git-pack-objects.txt37
-rw-r--r--Documentation/git-prune.txt6
-rw-r--r--Documentation/git-pull.txt6
-rw-r--r--Documentation/git-push.txt9
-rw-r--r--Documentation/git-read-tree.txt9
-rw-r--r--Documentation/git-rebase.txt182
-rw-r--r--Documentation/git-receive-pack.txt10
-rw-r--r--Documentation/git-remote-ext.txt12
-rw-r--r--Documentation/git-remote.txt16
-rw-r--r--Documentation/git-repack.txt13
-rw-r--r--Documentation/git-replace.txt11
-rw-r--r--Documentation/git-request-pull.txt4
-rw-r--r--Documentation/git-send-email.txt27
-rw-r--r--Documentation/git-send-pack.txt2
-rw-r--r--Documentation/git-shell.txt4
-rw-r--r--Documentation/git-shortlog.txt6
-rw-r--r--Documentation/git-show-branch.txt4
-rw-r--r--Documentation/git-show-ref.txt4
-rw-r--r--Documentation/git-show.txt6
-rw-r--r--Documentation/git-stash.txt2
-rw-r--r--Documentation/git-status.txt44
-rw-r--r--Documentation/git-submodule.txt37
-rw-r--r--Documentation/git-svn.txt15
-rw-r--r--Documentation/git-tag.txt8
-rw-r--r--Documentation/git-update-index.txt50
-rw-r--r--Documentation/git-update-ref.txt2
-rw-r--r--Documentation/git-var.txt4
-rw-r--r--Documentation/git-web--browse.txt2
-rw-r--r--Documentation/git-worktree.txt64
-rw-r--r--Documentation/git.txt16
-rw-r--r--Documentation/gitattributes.txt161
-rw-r--r--Documentation/githooks.txt115
-rw-r--r--Documentation/gitignore.txt11
-rw-r--r--Documentation/gitk.txt2
-rw-r--r--Documentation/gitremote-helpers.txt39
-rw-r--r--Documentation/gitrepository-layout.txt5
-rw-r--r--Documentation/gitsubmodules.txt112
-rw-r--r--Documentation/glossary-content.txt2
-rw-r--r--Documentation/howto/recover-corrupted-object-harder.txt2
-rw-r--r--Documentation/merge-config.txt8
-rw-r--r--Documentation/merge-options.txt3
-rw-r--r--Documentation/merge-strategies.txt13
-rw-r--r--Documentation/pretty-formats.txt2
-rw-r--r--Documentation/rev-list-options.txt11
-rw-r--r--Documentation/revisions.txt8
-rw-r--r--Documentation/technical/api-config.txt18
-rw-r--r--Documentation/technical/api-directory-listing.txt2
-rw-r--r--Documentation/technical/api-object-access.txt4
-rw-r--r--Documentation/technical/api-submodule-config.txt4
-rw-r--r--Documentation/technical/commit-graph-format.txt97
-rw-r--r--Documentation/technical/commit-graph.txt163
-rw-r--r--Documentation/technical/hash-function-transition.txt40
-rw-r--r--Documentation/technical/http-protocol.txt3
-rw-r--r--Documentation/technical/long-running-process-protocol.txt50
-rw-r--r--Documentation/technical/pack-format.txt92
-rw-r--r--Documentation/technical/pack-protocol.txt8
-rw-r--r--Documentation/technical/protocol-capabilities.txt8
-rw-r--r--Documentation/technical/protocol-v2.txt405
-rw-r--r--Documentation/technical/repository-version.txt12
-rw-r--r--Documentation/technical/shallow.txt20
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--INSTALL25
-rw-r--r--Makefile443
l---------RelNotes2
-rw-r--r--advice.c51
-rw-r--r--advice.h1
-rw-r--r--alloc.c1
-rw-r--r--apply.c161
-rw-r--r--archive-tar.c30
-rw-r-