summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--.mailmap4
-rw-r--r--.travis.yml7
-rw-r--r--Documentation/CodingGuidelines5
-rw-r--r--Documentation/Makefile1
-rw-r--r--Documentation/RelNotes/2.16.3.txt49
-rw-r--r--Documentation/RelNotes/2.17.0.txt275
-rw-r--r--Documentation/RelNotes/2.18.0.txt312
-rw-r--r--Documentation/SubmittingPatches4
-rw-r--r--Documentation/config.txt60
-rw-r--r--Documentation/diff-options.txt12
-rw-r--r--Documentation/fetch-options.txt17
-rw-r--r--Documentation/git-am.txt10
-rw-r--r--Documentation/git-apply.txt6
-rw-r--r--Documentation/git-bisect.txt4
-rw-r--r--Documentation/git-clone.txt2
-rw-r--r--Documentation/git-config.txt87
-rw-r--r--Documentation/git-daemon.txt28
-rw-r--r--Documentation/git-fetch-pack.txt2
-rw-r--r--Documentation/git-fetch.txt87
-rw-r--r--Documentation/git-filter-branch.txt8
-rw-r--r--Documentation/git-for-each-ref.txt2
-rw-r--r--Documentation/git-format-patch.txt2
-rw-r--r--Documentation/git-gc.txt30
-rw-r--r--Documentation/git-http-fetch.txt13
-rw-r--r--Documentation/git-index-pack.txt3
-rw-r--r--Documentation/git-interpret-trailers.txt2
-rw-r--r--Documentation/git-log.txt8
-rw-r--r--Documentation/git-ls-remote.txt16
-rw-r--r--Documentation/git-mktree.txt2
-rw-r--r--Documentation/git-push.txt2
-rw-r--r--Documentation/git-rebase.txt19
-rw-r--r--Documentation/git-remote.txt14
-rw-r--r--Documentation/git-send-email.txt23
-rw-r--r--Documentation/git-shortlog.txt6
-rw-r--r--Documentation/git-stash.txt2
-rw-r--r--Documentation/git-status.txt11
-rw-r--r--Documentation/git-submodule.txt4
-rw-r--r--Documentation/git-svn.txt13
-rw-r--r--Documentation/git-tag.txt8
-rw-r--r--Documentation/git-update-index.txt30
-rw-r--r--Documentation/git-worktree.txt55
-rw-r--r--Documentation/git.txt3
-rw-r--r--Documentation/gitattributes.txt103
-rw-r--r--Documentation/gitk.txt2
-rw-r--r--Documentation/gitremote-helpers.txt32
-rw-r--r--Documentation/gitrepository-layout.txt5
-rw-r--r--Documentation/gitsubmodules.txt14
-rw-r--r--Documentation/glossary-content.txt2
-rw-r--r--Documentation/howto/recover-corrupted-object-harder.txt2
-rw-r--r--Documentation/merge-options.txt3
-rw-r--r--Documentation/merge-strategies.txt2
-rw-r--r--Documentation/pretty-formats.txt2
-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.txt4
-rw-r--r--Documentation/technical/hash-function-transition.txt40
-rw-r--r--Documentation/technical/http-protocol.txt3
-rw-r--r--Documentation/technical/pack-format.txt92
-rw-r--r--Documentation/technical/protocol-v2.txt395
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--INSTALL14
-rw-r--r--Makefile374
l---------RelNotes2
-rw-r--r--advice.c49
-rw-r--r--apply.c11
-rw-r--r--archive-tar.c28
-rw-r--r--archive-zip.c18
-rw-r--r--archive.c32
-rw-r--r--archive.h10
-rw-r--r--attr.c2
-rw-r--r--bisect.c7
-rw-r--r--blame.c18
-rw-r--r--builtin.h2
-rw-r--r--builtin/add.c11
-rw-r--r--builtin/am.c69
-rw-r--r--builtin/archive.c2
-rw-r--r--builtin/blame.c23
-rw-r--r--builtin/branch.c11
-rw-r--r--builtin/cat-file.c30
-rw-r--r--builtin/check-ignore.c3
-rw-r--r--builtin/checkout-index.c2
-rw-r--r--builtin/checkout.c21
-rw-r--r--builtin/clean.c2
-rw-r--r--builtin/clone.c5
-rw-r--r--builtin/column.c1
-rw-r--r--builtin/commit-tree.c2
-rw-r--r--builtin/commit.c22
-rw-r--r--builtin/config.c154
-rw-r--r--builtin/count-objects.c7
-rw-r--r--builtin/describe.c8
-rw-r--r--builtin/difftool.c4
-rw-r--r--builtin/fast-export.c13
-rw-r--r--builtin/fetch-pack.c20
-rw-r--r--builtin/fetch.c89
-rw-r--r--builtin/fmt-merge-msg.c4
-rw-r--r--builtin/fsck.c19
-rw-r--r--builtin/gc.c20
-rw-r--r--builtin/grep.c69
-rw-r--r--builtin/hash-object.c2
-rw-r--r--builtin/help.c2
-rw-r--r--builtin/index-pack.c55
-rw-r--r--builtin/init-db.c2
-rw-r--r--builtin/log.c15
-rw-r--r--builtin/ls-files.c4
-rw-r--r--builtin/ls-remote.c50
-rw-r--r--builtin/ls-tree.c8
-rw-r--r--builtin/merge-tree.c7
-rw-r--r--builtin/merge.c68
-rw-r--r--builtin/mktag.c21
-rw-r--r--builtin/mktree.c24
-rw-r--r--builtin/mv.c16
-rw-r--r--builtin/name-rev.c2
-rw-r--r--builtin/notes.c20
-rw-r--r--builtin/pack-objects.c50
-rw-r--r--builtin/pack-redundant.c8
-rw-r--r--builtin/pack-refs.c3
-rw-r--r--builtin/prune.c2
-rw-r--r--builtin/pull.c4
-rw-r--r--builtin/push.c46
-rw-r--r--builtin/rebase--helper.c2
-rw-r--r--builtin/receive-pack.c21
-rw-r--r--builtin/reflog.c3
-rw-r--r--builtin/remote.c4
-rw-r--r--builtin/replace.c17
-rw-r--r--builtin/reset.c2
-rw-r--r--builtin/rev-list.c4
-rw-r--r--builtin/rev-parse.c2
-rw-r--r--builtin/rm.c11
-rw-r--r--builtin/send-pack.c20