summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml27
-rw-r--r--Documentation/Makefile5
-rw-r--r--Documentation/RelNotes/2.16.0.txt482
-rw-r--r--Documentation/RelNotes/2.16.1.txt11
-rw-r--r--Documentation/RelNotes/2.17.0.txt19
-rw-r--r--Documentation/SubmittingPatches2
-rw-r--r--Documentation/config.txt158
-rw-r--r--Documentation/diff-options.txt19
-rw-r--r--Documentation/git-add.txt9
-rw-r--r--Documentation/git-bisect.txt13
-rw-r--r--Documentation/git-branch.txt10
-rw-r--r--Documentation/git-check-ref-format.txt19
-rw-r--r--Documentation/git-checkout.txt10
-rw-r--r--Documentation/git-clone.txt19
-rw-r--r--Documentation/git-config.txt5
-rw-r--r--Documentation/git-describe.txt18
-rw-r--r--Documentation/git-for-each-ref.txt23
-rw-r--r--Documentation/git-log.txt7
-rw-r--r--Documentation/git-ls-files.txt7
-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.txt10
-rw-r--r--Documentation/git-rebase.txt19
-rw-r--r--Documentation/git-reflog.txt4
-rw-r--r--Documentation/git-rev-list.txt4
-rw-r--r--Documentation/git-send-email.txt6
-rw-r--r--Documentation/git-stash.txt25
-rw-r--r--Documentation/git-status.txt57
-rw-r--r--Documentation/git-update-index.txt45
-rw-r--r--Documentation/git-worktree.txt44
-rw-r--r--Documentation/git.txt28
-rw-r--r--Documentation/gitattributes.txt6
-rw-r--r--Documentation/githooks.txt51
-rw-r--r--Documentation/gitrepository-layout.txt4
-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.txt10
-rw-r--r--Documentation/merge-strategies.txt5
-rw-r--r--Documentation/pretty-formats.txt12
-rw-r--r--Documentation/rebase-config.txt52
-rw-r--r--Documentation/rev-list-options.txt46
-rw-r--r--Documentation/revisions.txt2
-rw-r--r--Documentation/technical/api-decorate.txt6
-rw-r--r--Documentation/technical/api-directory-listing.txt27
-rw-r--r--Documentation/technical/http-protocol.txt8
-rw-r--r--Documentation/technical/index-format.txt19
-rw-r--r--Documentation/technical/pack-protocol.txt43
-rw-r--r--Documentation/technical/partial-clone.txt324
-rw-r--r--Documentation/user-manual.txt24
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--Makefile31
l---------RelNotes2
-rw-r--r--advice.c4
-rw-r--r--advice.h2
-rw-r--r--apply.c25
-rw-r--r--apply.h8
-rw-r--r--archive.c2
-rw-r--r--bisect.c53
-rw-r--r--bisect.h2
-rw-r--r--blame.c20
-rw-r--r--branch.c50
-rw-r--r--branch.h37
-rw-r--r--builtin/add.c32
-rw-r--r--builtin/am.c98
-rw-r--r--builtin/apply.c4
-rw-r--r--builtin/bisect--helper.c137
-rw-r--r--builtin/blame.c10
-rw-r--r--builtin/branch.c43
-rw-r--r--builtin/checkout-index.c8
-rw-r--r--builtin/checkout.c91
-rw-r--r--builtin/clone.c35
-rw-r--r--builtin/commit.c54
-rw-r--r--builtin/config.c10
-rw-r--r--builtin/describe.c145
-rw-r--r--builtin/diff-tree.c2
-rw-r--r--builtin/diff.c17
-rw-r--r--builtin/difftool.c1
-rw-r--r--builtin/fast-export.c6
-rw-r--r--builtin/fetch.c15
-rw-r--r--builtin/fmt-merge-msg.c5
-rw-r--r--builtin/fsck.c3
-rw-r--r--builtin/grep.c1
-rw-r--r--builtin/index-pack.c11
-rw-r--r--builtin/log.c39
-rw-r--r--builtin/ls-files.c8
-rw-r--r--builtin/merge-base.c2
-rw-r--r--builtin/merge-ours.c16
-rw-r--r--builtin/merge.c19
-rw-r--r--builtin/mv.c2
-rw-r--r--builtin/notes.c18
-rw-r--r--builtin/pack-objects.c203
-rw-r--r--builtin/prune.c2
-rw-r--r--builtin/pull.c10
-rw-r--r--builtin/push.c26
-rw-r--r--builtin/rebase--helper.c29
-rw-r--r--builtin/receive-pack.c31
-rw-r--r--builtin/reflog.c32
-rw-r--r--builtin/remote.c8
-rw-r--r--builtin/replace.c8
-rw-r--r--builtin/reset.c10
-rw-r--r--builtin/rev-list.c118
-rw-r--r--builtin/rev-parse.c2
-rw-r--r--builtin/rm.c2
-rw-r--r--builtin/show-branch.c14
-rw-r--r--builtin/show-ref.c4
-rw-r--r--builtin/submodule--helper.c275
-rw-r--r--builtin/symbolic-ref.c2
-rw-r--r--builtin/tag.c8
-rw-r--r--builtin/update-index.c48
-rw-r--r--builtin/update-ref.c16
-rw-r--r--builtin/worktree.c74
-rw-r--r--bundle.c4
-rw-r--r--cache-tree.c12
-rw-r--r--cache.h83
-rw-r--r--checkout.c43
-rw-r--r--checkout.h13
-rwxr-xr-xci/install-dependencies.sh8
-rwxr-xr-xci/lib-travisci.sh103
-rwxr-xr-xci/print-test-failures.sh9
-rwxr-xr-xci/run-linux32-build.sh3
-rwxr-xr-xci/run-linux32-docker.sh5
-rwxr-xr-xci/run-static-analysis.sh2
-rwxr-xr-xci/run-tests.sh5
-rwxr-xr-xci/run-windows-build.sh7
-rwxr-xr-xci/test-documentation.sh8
-rw-r--r--color.c3
-rw-r--r--combine-diff.c12
-rw-r--r--