summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitattributes6
-rw-r--r--.gitignore3
-rw-r--r--.mailmap4
-rw-r--r--.travis.yml3
-rw-r--r--Documentation/Makefile3
-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.4.txt5
-rw-r--r--Documentation/RelNotes/2.17.1.txt16
-rw-r--r--Documentation/RelNotes/2.18.0.txt291
-rw-r--r--Documentation/SubmittingPatches4
-rw-r--r--Documentation/config.txt101
-rw-r--r--Documentation/diff-config.txt3
-rw-r--r--Documentation/diff-options.txt4
-rw-r--r--Documentation/fetch-options.txt8
-rw-r--r--Documentation/git-add.txt4
-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-clone.txt4
-rw-r--r--Documentation/git-commit-graph.txt94
-rw-r--r--Documentation/git-config.txt81
-rw-r--r--Documentation/git-cvsserver.txt10
-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-filter-branch.txt8
-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.txt25
-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.txt4
-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.txt26
-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.txt4
-rw-r--r--Documentation/git-rebase.txt170
-rw-r--r--Documentation/git-receive-pack.txt10
-rw-r--r--Documentation/git-remote-ext.txt12
-rw-r--r--Documentation/git-remote.txt2
-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.txt22
-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.txt2
-rw-r--r--Documentation/git-status.txt12
-rw-r--r--Documentation/git-submodule.txt21
-rw-r--r--Documentation/git-svn.txt2
-rw-r--r--Documentation/git-update-index.txt20
-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.txt29
-rw-r--r--Documentation/git.txt3
-rw-r--r--Documentation/gitattributes.txt92
-rw-r--r--Documentation/githooks.txt115
-rw-r--r--Documentation/gitk.txt2
-rw-r--r--Documentation/gitremote-helpers.txt32
-rw-r--r--Documentation/glossary-content.txt2
-rw-r--r--Documentation/merge-config.txt8
-rw-r--r--Documentation/merge-strategies.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.txt2
-rw-r--r--Documentation/technical/api-submodule-config.txt2
-rw-r--r--Documentation/technical/commit-graph-format.txt97
-rw-r--r--Documentation/technical/commit-graph.txt163
-rw-r--r--Documentation/technical/pack-format.txt92
-rw-r--r--Documentation/technical/protocol-v2.txt405
-rw-r--r--Documentation/technical/shallow.txt20
-rw-r--r--Makefile189
-rw-r--r--advice.c51
-rw-r--r--advice.h1
-rw-r--r--alloc.c1
-rw-r--r--apply.c10
-rw-r--r--archive-tar.c4
-rw-r--r--archive-zip.c3
-rw-r--r--argv-array.c20
-rw-r--r--argv-array.h2
-rw-r--r--attr.c12
-rw-r--r--blame.c24
-rw-r--r--builtin.h3
-rw-r--r--builtin/add.c5
-rw-r--r--builtin/am.c22
-rw-r--r--builtin/blame.c131
-rw-r--r--builtin/branch.c9
-rw-r--r--builtin/cat-file.c16
-rw-r--r--builtin/checkout.c18
-rw-r--r--builtin/clone.c4
-rw-r--r--builtin/column.c1
-rw-r--r--builtin/commit-graph.c171
-rw-r--r--builtin/commit.c49
-rw-r--r--builtin/config.c144
-rw-r--r--builtin/describe.c6
-rw-r--r--builtin/diff.c2
-rw-r--r--builtin/difftool.c4
-rw-r--r--builtin/fast-export.c22
-rw-r--r--builtin/fetch-pack.c20
-rw-r--r--builtin/fetch.c28
-rw-r--r--builtin/fsck.c48
-rw-r--r--builtin/gc.c173
-rw-r--r--builtin/grep.c14
-rw-r--r--builtin/hash-object.c2
-rw-r--r--builtin/help.c2
-rw-r--r--builtin/index-pack.c26
-rw-r--r--builtin/init-db.c4
-rw-r--r--builtin/log.c6
-rw-r--r--