summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.clang-format169
-rw-r--r--.mailmap2
-rw-r--r--.travis.yml88
-rw-r--r--.tsan-suppressions10
-rw-r--r--Documentation/Makefile1
-rw-r--r--Documentation/RelNotes/2.10.5.txt17
-rw-r--r--Documentation/RelNotes/2.11.4.txt17
-rw-r--r--Documentation/RelNotes/2.12.5.txt17
-rw-r--r--Documentation/RelNotes/2.13.6.txt17
-rw-r--r--Documentation/RelNotes/2.14.2.txt70
-rw-r--r--Documentation/RelNotes/2.14.3.txt99
-rw-r--r--Documentation/RelNotes/2.15.0.txt336
-rw-r--r--Documentation/RelNotes/2.15.1.txt88
-rw-r--r--Documentation/SubmittingPatches21
-rw-r--r--Documentation/config.txt29
-rw-r--r--Documentation/diff-heuristic-options.txt5
-rw-r--r--Documentation/diff-options.txt7
-rw-r--r--Documentation/git-add.txt3
-rw-r--r--Documentation/git-annotate.txt1
-rw-r--r--Documentation/git-apply.txt4
-rw-r--r--Documentation/git-blame.txt2
-rw-r--r--Documentation/git-branch.txt28
-rw-r--r--Documentation/git-cat-file.txt2
-rw-r--r--Documentation/git-check-ref-format.txt9
-rw-r--r--Documentation/git-checkout.txt32
-rw-r--r--Documentation/git-config.txt8
-rw-r--r--Documentation/git-cvsserver.txt2
-rw-r--r--Documentation/git-describe.txt24
-rw-r--r--Documentation/git-diff-index.txt6
-rw-r--r--Documentation/git-filter-branch.txt28
-rw-r--r--Documentation/git-for-each-ref.txt44
-rw-r--r--Documentation/git-grep.txt6
-rw-r--r--Documentation/git-merge.txt8
-rw-r--r--Documentation/git-notes.txt2
-rw-r--r--Documentation/git-read-tree.txt2
-rw-r--r--Documentation/git-rebase.txt18
-rw-r--r--Documentation/git-rerere.txt2
-rw-r--r--Documentation/git-rev-parse.txt5
-rw-r--r--Documentation/git-rm.txt2
-rw-r--r--Documentation/git-shell.txt16
-rw-r--r--Documentation/git-status.txt2
-rw-r--r--Documentation/git-svn.txt2
-rw-r--r--Documentation/git-tag.txt7
-rw-r--r--Documentation/git-update-index.txt4
-rw-r--r--Documentation/git.txt32
-rw-r--r--Documentation/gitattributes.txt5
-rw-r--r--Documentation/gitcore-tutorial.txt8
-rw-r--r--Documentation/githooks.txt11
-rw-r--r--Documentation/gitrepository-layout.txt2
-rw-r--r--Documentation/gittutorial.txt2
-rw-r--r--Documentation/glossary-content.txt2
-rw-r--r--Documentation/merge-options.txt8
-rw-r--r--Documentation/merge-strategies.txt3
-rw-r--r--Documentation/pull-fetch-param.txt6
-rw-r--r--Documentation/rev-list-options.txt14
-rw-r--r--Documentation/technical/api-argv-array.txt2
-rw-r--r--Documentation/technical/api-config.txt4
-rw-r--r--Documentation/technical/api-ref-iteration.txt7
-rw-r--r--Documentation/technical/api-string-list.txt209
-rw-r--r--Documentation/technical/hash-function-transition.txt797
-rw-r--r--Documentation/technical/pack-protocol.txt2
-rw-r--r--Documentation/technical/trivial-merge.txt4
-rw-r--r--Documentation/user-manual.txt12
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--Makefile35
l---------RelNotes2
-rw-r--r--abspath.c4
-rw-r--r--apply.c99
-rw-r--r--archive.c54
-rw-r--r--attr.c15
-rw-r--r--bisect.c36
-rw-r--r--bisect.h12
-rw-r--r--branch.c24
-rw-r--r--builtin/add.c3
-rw-r--r--builtin/am.c34
-rw-r--r--builtin/blame.c2
-rw-r--r--builtin/branch.c102
-rw-r--r--builtin/cat-file.c5
-rw-r--r--builtin/check-ref-format.c7
-rw-r--r--builtin/checkout.c14
-rw-r--r--builtin/clean.c10
-rw-r--r--builtin/clone.c2
-rw-r--r--builtin/commit-tree.c1
-rw-r--r--builtin/commit.c30
-rw-r--r--builtin/config.c11
-rw-r--r--builtin/describe.c38
-rw-r--r--builtin/diff-index.c1
-rw-r--r--builtin/diff.c3
-rw-r--r--builtin/fast-export.c49
-rw-r--r--builtin/fmt-merge-msg.c2
-rw-r--r--builtin/for-each-ref.c1
-rw-r--r--builtin/fsck.c7
-rw-r--r--builtin/gc.c10
-rw-r--r--builtin/get-tar-commit-id.c9
-rw-r--r--builtin/grep.c4
-rw-r--r--builtin/help.c5
-rw-r--r--builtin/index-pack.c4
-rw-r--r--builtin/init-db.c2
-rw-r--r--builtin/log.c3
-rw-r--r--builtin/ls-files.c1
-rw-r--r--builtin/merge-base.c40
-rw-r--r--builtin/merge.c22
-rw-r--r--builtin/name-rev.c3
-rw-r--r--builtin/notes.c1
-rw-r--r--builtin/pack-objects.c16
-rw-r--r--builtin/pull.c13
-rw-r--r--builtin/rebase--helper.c29
-rw-r--r--builtin/receive-pack.c8
-rw-r--r--builtin/reflog.c6
-rw-r--r--builtin/remote-ext.c2
-rw-r--r--builtin/remote.c13
-rw-r--r--builtin/rerere.c2
-rw-r--r--builtin/reset.c28
-rw-r--r--builtin/rev-list.c3
-rw-r--r--builtin/rev-parse.c27
-rw-r--r--builtin/shortlog.c56
-rw-r--r--builtin/show-branch.c2
-rw-r--r--builtin/submodule--helper.c7
-rw-r--r--builtin/symbolic-ref.c3
-rw-r--r--builtin/tag.c12
-rw-r--r--builtin/unpack-file.c2
-rw-r--r--builtin/unpack-objects.c2
-rw-r--r--builtin/update-index.c15
-rw-r--r--builtin/worktree.c26
-rw-r--r--bulk-checkin.c5
-rw-r--r--bundle.c9
-rw-r--r--cache-tree.c39
-rw-r--r--cache.h14
-rwxr-xr-xci/install-dependencies.sh44
-rwxr-xr-xci/lib-travisci.sh36
-rwxr-xr-xci/print-te