summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.clang-format169
-rw-r--r--.mailmap1
-rw-r--r--.travis.yml34
-rw-r--r--Documentation/.gitignore1
-rw-r--r--Documentation/Makefile12
-rw-r--r--Documentation/RelNotes/2.15.0.txt508
-rw-r--r--Documentation/RelNotes/2.15.1.txt88
-rw-r--r--Documentation/RelNotes/2.15.2.txt47
-rw-r--r--Documentation/RelNotes/2.16.0.txt482
-rw-r--r--Documentation/RelNotes/2.16.1.txt11
-rw-r--r--Documentation/RelNotes/2.16.2.txt30
-rw-r--r--Documentation/SubmittingPatches365
-rw-r--r--Documentation/config.txt210
-rw-r--r--Documentation/diff-heuristic-options.txt5
-rw-r--r--Documentation/diff-options.txt60
-rw-r--r--Documentation/git-add.txt9
-rw-r--r--Documentation/git-annotate.txt1
-rw-r--r--Documentation/git-apply.txt4
-rw-r--r--Documentation/git-bisect.txt13
-rw-r--r--Documentation/git-blame.txt2
-rw-r--r--Documentation/git-branch.txt34
-rw-r--r--Documentation/git-cat-file.txt7
-rw-r--r--Documentation/git-check-ref-format.txt24
-rw-r--r--Documentation/git-checkout.txt10
-rw-r--r--Documentation/git-clone.txt19
-rw-r--r--Documentation/git-commit.txt2
-rw-r--r--Documentation/git-config.txt13
-rw-r--r--Documentation/git-cvsserver.txt2
-rw-r--r--Documentation/git-describe.txt42
-rw-r--r--Documentation/git-diff-index.txt6
-rw-r--r--Documentation/git-filter-branch.txt28
-rw-r--r--Documentation/git-for-each-ref.txt31
-rw-r--r--Documentation/git-format-patch.txt4
-rw-r--r--Documentation/git-grep.txt7
-rw-r--r--Documentation/git-interpret-trailers.txt62
-rw-r--r--Documentation/git-log.txt7
-rw-r--r--Documentation/git-ls-files.txt7
-rw-r--r--Documentation/git-merge-base.txt64
-rw-r--r--Documentation/git-merge.txt8
-rw-r--r--Documentation/git-notes.txt2
-rw-r--r--Documentation/git-p4.txt8
-rw-r--r--Documentation/git-pack-objects.txt22
-rw-r--r--Documentation/git-prune.txt9
-rw-r--r--Documentation/git-push.txt14
-rw-r--r--Documentation/git-read-tree.txt5
-rw-r--r--Documentation/git-rebase.txt37
-rw-r--r--Documentation/git-reflog.txt4
-rw-r--r--Documentation/git-rerere.txt2
-rw-r--r--Documentation/git-rev-list.txt4
-rw-r--r--Documentation/git-rev-parse.txt5
-rw-r--r--Documentation/git-rm.txt2
-rw-r--r--Documentation/git-send-email.txt6
-rw-r--r--Documentation/git-send-pack.txt4
-rw-r--r--Documentation/git-show.txt4
-rw-r--r--Documentation/git-stash.txt25
-rw-r--r--Documentation/git-status.txt61
-rw-r--r--Documentation/git-submodule.txt16
-rw-r--r--Documentation/git-svn.txt2
-rw-r--r--Documentation/git-update-index.txt47
-rw-r--r--Documentation/git-worktree.txt45
-rw-r--r--Documentation/git.txt68
-rw-r--r--Documentation/gitattributes.txt6
-rw-r--r--Documentation/gitcore-tutorial.txt8
-rw-r--r--Documentation/githooks.txt66
-rw-r--r--Documentation/gitignore.txt11
-rw-r--r--Documentation/gitrepository-layout.txt6
-rw-r--r--Documentation/gitsubmodules.txt100
-rw-r--r--Documentation/gittutorial.txt2
-rw-r--r--Documentation/gitworkflows.txt6
-rwxr-xr-xDocumentation/install-doc-quick.sh9
-rw-r--r--Documentation/merge-config.txt4
-rw-r--r--Documentation/merge-options.txt18
-rw-r--r--Documentation/merge-strategies.txt5
-rw-r--r--Documentation/pretty-formats.txt9
-rw-r--r--Documentation/rebase-config.txt52
-rw-r--r--Documentation/rev-list-options.txt60
-rw-r--r--Documentation/revisions.txt2
-rw-r--r--Documentation/technical/api-argv-array.txt2
-rw-r--r--Documentation/technical/api-config.txt2
-rw-r--r--Documentation/technical/api-decorate.txt6
-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/api-submodule-config.txt2
-rw-r--r--Documentation/technical/api-tree-walking.txt6
-rw-r--r--Documentation/technical/hash-function-transition.txt797
-rw-r--r--Documentation/technical/http-protocol.txt8
-rw-r--r--Documentation/technical/index-format.txt19
-rw-r--r--Documentation/technical/pack-protocol.txt45
-rw-r--r--Documentation/technical/partial-clone.txt324
-rw-r--r--Documentation/technical/trivial-merge.txt4
-rw-r--r--Documentation/user-manual.txt36
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--Makefile71
l---------RelNotes2
-rw-r--r--abspath.c4
-rw-r--r--advice.c4
-rw-r--r--advice.h2
-rw-r--r--apply.c130
-rw-r--r--apply.h8
-rw-r--r--archive.c4
-rw-r--r--attr.c27
-rw-r--r--bisect.c127
-rw-r--r--bisect.h14
-rw-r--r--blame.c20
-rw-r--r--branch.c67
-rw-r--r--branch.h37
-rw-r--r--builtin/add.c34
-rw-r--r--builtin/am.c137
-rw-r--r--builtin/apply.c4
-rw-r--r--builtin/bisect--helper.c137
-rw-r--r--builtin/blame.c15
-rw-r--r--builtin/branch.c132
-rw-r--r--builtin/cat-file.c10
-rw-r--r--builtin/check-ref-format.c7
-rw-r--r--builtin/checkout-index.c8
-rw-r--r--builtin/checkout.c107
-rw-r--r--builtin/clean.c26
-rw-r--r--builtin/clone.c69
-rw-r--r--builtin/commit-tree.c4
-rw-r--r--builtin/commit.c116
-rw-r--r--builtin/config.c21
-rw-r--r--builtin/count-objects.c1
-rw-r--r--builtin/describe.c185
-rw-r--r--builtin/diff-files.c1
-rw-r--r--builtin/diff-index.c2
-rw-r--r--builtin/diff-tree.c3
-rw-r--r--builtin/diff.c22
-rw-r--r--builtin/difftool.c40