summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.clang-format169
-rw-r--r--.github/CONTRIBUTING.md19
-rw-r--r--.github/PULL_REQUEST_TEMPLATE.md7
-rw-r--r--.gitmodules4
-rw-r--r--.mailmap2
-rw-r--r--.travis.yml88
-rw-r--r--.tsan-suppressions10
-rw-r--r--Documentation/.gitignore1
-rw-r--r--Documentation/Makefile8
-rw-r--r--Documentation/RelNotes/1.7.10.1.txt2
-rw-r--r--Documentation/RelNotes/2.10.4.txt4
-rw-r--r--Documentation/RelNotes/2.10.5.txt17
-rw-r--r--Documentation/RelNotes/2.11.3.txt4
-rw-r--r--Documentation/RelNotes/2.11.4.txt17
-rw-r--r--Documentation/RelNotes/2.12.0.txt2
-rw-r--r--Documentation/RelNotes/2.12.4.txt4
-rw-r--r--Documentation/RelNotes/2.12.5.txt17
-rw-r--r--Documentation/RelNotes/2.13.2.txt54
-rw-r--r--Documentation/RelNotes/2.13.3.txt62
-rw-r--r--Documentation/RelNotes/2.13.4.txt28
-rw-r--r--Documentation/RelNotes/2.13.5.txt4
-rw-r--r--Documentation/RelNotes/2.13.6.txt17
-rw-r--r--Documentation/RelNotes/2.14.0.txt293
-rw-r--r--Documentation/RelNotes/2.14.1.txt4
-rw-r--r--Documentation/RelNotes/2.14.2.txt105
-rw-r--r--Documentation/RelNotes/2.14.3.txt99
-rw-r--r--Documentation/RelNotes/2.15.0.txt508
-rw-r--r--Documentation/RelNotes/2.15.1.txt88
-rw-r--r--Documentation/RelNotes/2.7.6.txt25
-rw-r--r--Documentation/RelNotes/2.8.6.txt4
-rw-r--r--Documentation/RelNotes/2.9.5.txt4
-rw-r--r--Documentation/SubmittingPatches365
-rw-r--r--Documentation/config.txt98
-rw-r--r--Documentation/diff-config.txt11
-rw-r--r--Documentation/diff-heuristic-options.txt5
-rw-r--r--Documentation/diff-options.txt60
-rw-r--r--Documentation/git-add.txt10
-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.txt18
-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-commit.txt11
-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-fast-import.txt2
-rw-r--r--Documentation/git-filter-branch.txt31
-rw-r--r--Documentation/git-for-each-ref.txt59
-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.txt19
-rw-r--r--Documentation/git-notes.txt2
-rw-r--r--Documentation/git-pack-objects.txt17
-rw-r--r--Documentation/git-patch-id.txt3
-rw-r--r--Documentation/git-pull.txt14
-rw-r--r--Documentation/git-push.txt4
-rw-r--r--Documentation/git-read-tree.txt2
-rw-r--r--Documentation/git-rebase.txt22
-rw-r--r--Documentation/git-rerere.txt2
-rw-r--r--Documentation/git-reset.txt4
-rw-r--r--Documentation/git-rev-parse.txt5
-rw-r--r--Documentation/git-rm.txt15
-rw-r--r--Documentation/git-send-email.txt15
-rw-r--r--Documentation/git-send-pack.txt4
-rw-r--r--Documentation/git-shell.txt16
-rw-r--r--Documentation/git-stash.txt60
-rw-r--r--Documentation/git-status.txt5
-rw-r--r--Documentation/git-submodule.txt95
-rw-r--r--Documentation/git-svn.txt17
-rw-r--r--Documentation/git-tag.txt14
-rw-r--r--Documentation/git-update-index.txt4
-rw-r--r--Documentation/git.txt33
-rw-r--r--Documentation/gitattributes.txt76
-rw-r--r--Documentation/gitcli.txt2
-rw-r--r--Documentation/gitcore-tutorial.txt8
-rw-r--r--Documentation/githooks.txt15
-rw-r--r--Documentation/gitrepository-layout.txt2
-rw-r--r--Documentation/gitsubmodules.txt221
-rw-r--r--Documentation/gittutorial.txt2
-rw-r--r--Documentation/glossary-content.txt6
-rw-r--r--Documentation/i18n.txt10
-rw-r--r--Documentation/merge-options.txt8
-rw-r--r--Documentation/merge-strategies.txt3
-rw-r--r--Documentation/pretty-formats.txt26
-rw-r--r--Documentation/pull-fetch-param.txt6
-rw-r--r--Documentation/rev-list-options.txt18
-rw-r--r--Documentation/technical/api-argv-array.txt2
-rw-r--r--Documentation/technical/api-builtin.txt73
-rw-r--r--Documentation/technical/api-config.txt2
-rw-r--r--Documentation/technical/api-hashmap.txt309
-rw-r--r--Documentation/technical/api-ref-iteration.txt7
-rw-r--r--Documentation/technical/api-string-list.txt209
-rw-r--r--Documentation/technical/api-sub-process.txt59
-rw-r--r--Documentation/technical/api-tree-walking.txt6
-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--Makefile142
l---------RelNotes2
-rw-r--r--abspath.c6
-rw-r--r--advice.c3
-rw-r--r--advice.h1
-rw-r--r--alias.c35
-rw-r--r--apply.c227
-rw-r--r--apply.h1
-rw-r--r--archive-tar.c1
-rw-r--r--archive-zip.c1
-rw-r--r--archive.c57
-rw-r--r--attr.c40
-rw-r--r--bisect.c62
-rw-r--r--bisect.h12
-rw-r--r--blame.c31
-rw-r--r--branch.c28
-rw-r--r--builtin.h100
-rw-r--r--builtin/add.c57
-rw-r--r--builtin/am.c108
-rw-r--r--builtin/blame.c8
-rw-r--r--builtin/branch.c73
-rw-r--r--builtin/cat-file.c22
-rw-r--r--builtin/check-attr.c1
-rw-r--r--builtin/check-ignore.c1
-rw-r--r--