summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.clang-format169
-rw-r--r--.mailmap2
-rw-r--r--.travis.yml88
-rw-r--r--Documentation/.gitignore1
-rw-r--r--Documentation/Makefile7
-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.txt11
-rw-r--r--Documentation/RelNotes/2.14.3.txt99
-rw-r--r--Documentation/RelNotes/2.15.0.txt273
-rw-r--r--Documentation/RelNotes/2.15.1.txt68
-rw-r--r--Documentation/RelNotes/2.16.0.txt211
-rw-r--r--Documentation/SubmittingPatches346
-rw-r--r--Documentation/config.txt61
-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-bisect.txt13
-rw-r--r--Documentation/git-blame.txt2
-rw-r--r--Documentation/git-branch.txt22
-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-describe.txt24
-rw-r--r--Documentation/git-filter-branch.txt28
-rw-r--r--Documentation/git-for-each-ref.txt67
-rw-r--r--Documentation/git-grep.txt6
-rw-r--r--Documentation/git-merge.txt14
-rw-r--r--Documentation/git-notes.txt2
-rw-r--r--Documentation/git-push.txt10
-rw-r--r--Documentation/git-read-tree.txt2
-rw-r--r--Documentation/git-rebase.txt16
-rw-r--r--Documentation/git-rev-parse.txt5
-rw-r--r--Documentation/git-shell.txt16
-rw-r--r--Documentation/git-stash.txt21
-rw-r--r--Documentation/git-status.txt23
-rw-r--r--Documentation/git-tag.txt7
-rw-r--r--Documentation/git-update-index.txt2
-rw-r--r--Documentation/git.txt32
-rw-r--r--Documentation/gitattributes.txt5
-rw-r--r--Documentation/githooks.txt9
-rw-r--r--Documentation/gitworkflows.txt2
-rw-r--r--Documentation/glossary-content.txt2
-rw-r--r--Documentation/merge-options.txt16
-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-directory-listing.txt27
-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/user-manual.txt2
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--Makefile35
l---------RelNotes2
-rw-r--r--abspath.c4
-rw-r--r--advice.c2
-rw-r--r--advice.h1
-rw-r--r--apply.c28
-rw-r--r--apply.h8
-rw-r--r--archive.c21
-rw-r--r--attr.c15
-rw-r--r--bisect.c83
-rw-r--r--bisect.h14
-rw-r--r--blame.c20
-rw-r--r--branch.c7
-rw-r--r--builtin/add.c7
-rw-r--r--builtin/am.c89
-rw-r--r--builtin/apply.c4
-rw-r--r--builtin/bisect--helper.c137
-rw-r--r--builtin/blame.c10
-rw-r--r--builtin/branch.c87
-rw-r--r--builtin/cat-file.c5
-rw-r--r--builtin/check-ref-format.c7
-rw-r--r--builtin/checkout-index.c8
-rw-r--r--builtin/checkout.c40
-rw-r--r--builtin/clean.c10
-rw-r--r--builtin/clone.c31
-rw-r--r--builtin/commit-tree.c1
-rw-r--r--builtin/commit.c82
-rw-r--r--builtin/config.c11
-rw-r--r--builtin/describe.c55
-rw-r--r--builtin/diff-index.c1
-rw-r--r--builtin/diff.c18
-rw-r--r--builtin/difftool.c1
-rw-r--r--builtin/fast-export.c53
-rw-r--r--builtin/fetch.c8
-rw-r--r--builtin/fmt-merge-msg.c4
-rw-r--r--builtin/for-each-ref.c1
-rw-r--r--builtin/fsck.c10
-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.c32
-rw-r--r--builtin/ls-files.c1
-rw-r--r--builtin/merge-base.c42
-rw-r--r--builtin/merge-ours.c16
-rw-r--r--builtin/merge.c35
-rw-r--r--builtin/name-rev.c3
-rw-r--r--builtin/notes.c15
-rw-r--r--builtin/pack-objects.c149
-rw-r--r--builtin/pull.c21
-rw-r--r--builtin/push.c26
-rw-r--r--builtin/rebase--helper.c29
-rw-r--r--builtin/receive-pack.c22
-rw-r--r--builtin/reflog.c24
-rw-r--r--builtin/remote-ext.c2
-rw-r--r--builtin/remote.c21
-rw-r--r--builtin/replace.c8
-rw-r--r--builtin/rerere.c2
-rw-r--r--builtin/reset.c36
-rw-r--r--builtin/rev-list.c9
-rw-r--r--builtin/rev-parse.c29
-rw-r--r--builtin/shortlog.c56
-rw-r--r--builtin/show-branch.c14
-rw-r--r--builtin/show-ref.c4
-rw-r--r--builtin/submodule--helper.c282
-rw-r--r--builtin/symbolic-ref.c5
-rw-r--r--builtin/tag.c20
-rw-r--r--builtin/unpack-file.c2
-rw-r--r--builtin/unpack-objects.c2
-rw-r--r--builtin/update-index.c25