summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.clang-format169
-rw-r--r--.travis.yml88
-rw-r--r--.tsan-suppressions10
-rw-r--r--Documentation/RelNotes/2.15.0.txt483
-rw-r--r--Documentation/config.txt35
-rw-r--r--Documentation/diff-options.txt34
-rw-r--r--Documentation/git-add.txt3
-rw-r--r--Documentation/git-apply.txt4
-rw-r--r--Documentation/git-branch.txt24
-rw-r--r--Documentation/git-cat-file.txt2
-rw-r--r--Documentation/git-checkout.txt2
-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.txt8
-rw-r--r--Documentation/git-for-each-ref.txt33
-rw-r--r--Documentation/git-format-patch.txt4
-rw-r--r--Documentation/git-grep.txt13
-rw-r--r--Documentation/git-interpret-trailers.txt60
-rw-r--r--Documentation/git-merge.txt10
-rw-r--r--Documentation/git-notes.txt2
-rw-r--r--Documentation/git-push.txt4
-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.txt3
-rw-r--r--Documentation/git-rm.txt2
-rw-r--r--Documentation/git-send-pack.txt4
-rw-r--r--Documentation/git-status.txt2
-rw-r--r--Documentation/git-svn.txt2
-rw-r--r--Documentation/git-tag.txt2
-rw-r--r--Documentation/git-update-index.txt4
-rw-r--r--Documentation/git.txt14
-rw-r--r--Documentation/gitattributes.txt5
-rw-r--r--Documentation/gitcore-tutorial.txt8
-rw-r--r--Documentation/githooks.txt15
-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.txt2
-rw-r--r--Documentation/merge-strategies.txt3
-rw-r--r--Documentation/pretty-formats.txt5
-rw-r--r--Documentation/rev-list-options.txt8
-rw-r--r--Documentation/technical/api-config.txt2
-rw-r--r--Documentation/technical/api-ref-iteration.txt7
-rw-r--r--Documentation/technical/api-string-list.txt209
-rw-r--r--Documentation/technical/api-tree-walking.txt6
-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--Makefile34
l---------RelNotes2
-rw-r--r--abspath.c4
-rw-r--r--apply.c44
-rw-r--r--archive.c21
-rw-r--r--attr.c27
-rw-r--r--bisect.c21
-rw-r--r--branch.c24
-rw-r--r--builtin/add.c4
-rw-r--r--builtin/am.c41
-rw-r--r--builtin/blame.c5
-rw-r--r--builtin/branch.c94
-rw-r--r--builtin/cat-file.c14
-rw-r--r--builtin/check-ref-format.c1
-rw-r--r--builtin/checkout.c16
-rw-r--r--builtin/clean.c26
-rw-r--r--builtin/clone.c3
-rw-r--r--builtin/commit-tree.c5
-rw-r--r--builtin/commit.c50
-rw-r--r--builtin/config.c11
-rw-r--r--builtin/count-objects.c1
-rw-r--r--builtin/describe.c47
-rw-r--r--builtin/diff-files.c1
-rw-r--r--builtin/diff-index.c1
-rw-r--r--builtin/diff-tree.c1
-rw-r--r--builtin/diff.c2
-rw-r--r--builtin/difftool.c39
-rw-r--r--builtin/fast-export.c49
-rw-r--r--builtin/fetch.c32
-rw-r--r--builtin/fsck.c18
-rw-r--r--builtin/gc.c11
-rw-r--r--builtin/get-tar-commit-id.c9
-rw-r--r--builtin/grep.c406
-rw-r--r--builtin/hash-object.c12
-rw-r--r--builtin/help.c5
-rw-r--r--builtin/index-pack.c1
-rw-r--r--builtin/init-db.c2
-rw-r--r--builtin/interpret-trailers.c107
-rw-r--r--builtin/log.c27
-rw-r--r--builtin/ls-files.c7
-rw-r--r--builtin/merge-tree.c16
-rw-r--r--builtin/merge.c30
-rw-r--r--builtin/mv.c3
-rw-r--r--builtin/name-rev.c2
-rw-r--r--builtin/notes.c3
-rw-r--r--builtin/pack-objects.c15
-rw-r--r--builtin/pack-redundant.c1
-rw-r--r--builtin/prune-packed.c4
-rw-r--r--builtin/prune.c2
-rw-r--r--builtin/pull.c12
-rw-r--r--builtin/push.c2
-rw-r--r--builtin/read-tree.c2
-rw-r--r--builtin/rebase--helper.c29
-rw-r--r--builtin/receive-pack.c15
-rw-r--r--builtin/reflog.c6
-rw-r--r--builtin/remote-ext.c2
-rw-r--r--builtin/remote.c13
-rw-r--r--builtin/replace.c6
-rw-r--r--builtin/rerere.c2
-rw-r--r--builtin/reset.c41
-rw-r--r--builtin/rev-list.c2
-rw-r--r--builtin/rev-parse.c35
-rw-r--r--builtin/rm.c3
-rw-r--r--builtin/send-pack.c2
-rw-r--r--builtin/shortlog.c56
-rw-r--r--builtin/show-branch.c8
-rw-r--r--builtin/submodule--helper.c83
-rw-r--r--builtin/symbolic-ref.c3
-rw-r--r--builtin/tag.c2
-rw-r--r--builtin/unpack-file.c14
-rw-r--r--builtin/update-index.c17
-rw-r--r--builtin/update-ref.c69
-rw-r--r--builtin/verify-tag.c9
-rw-r--r--builtin/worktree.c26
-rw-r--r--bulk-checkin.c6
-rw-r--r--bundle.c9
-rw-r--r--cache-tree.c37
-rw-r--r--cache.h193
-rwxr-xr-xci/install-dependencies.sh46
-rwxr-xr-xci/lib-travisci.sh28
-rwxr-xr-x