summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.clang-format2
-rw-r--r--Documentation/CodingGuidelines5
-rw-r--r--Documentation/Makefile1
-rw-r--r--Documentation/RelNotes/2.17.0.txt398
-rw-r--r--Documentation/config.txt27
-rw-r--r--Documentation/diff-options.txt18
-rw-r--r--Documentation/fetch-options.txt17
-rw-r--r--Documentation/git-am.txt10
-rw-r--r--Documentation/git-config.txt6
-rw-r--r--Documentation/git-daemon.txt28
-rw-r--r--Documentation/git-fetch.txt87
-rw-r--r--Documentation/git-index-pack.txt3
-rw-r--r--Documentation/git-pack-objects.txt11
-rw-r--r--Documentation/git-rebase.txt12
-rw-r--r--Documentation/git-remote.txt14
-rw-r--r--Documentation/git-send-email.txt5
-rw-r--r--Documentation/git-stash.txt2
-rw-r--r--Documentation/git-status.txt5
-rw-r--r--Documentation/git-tag.txt8
-rw-r--r--Documentation/git-update-index.txt26
-rw-r--r--Documentation/git-worktree.txt34
-rw-r--r--Documentation/git.txt3
-rw-r--r--Documentation/gitattributes.txt69
-rw-r--r--Documentation/gitremote-helpers.txt7
-rw-r--r--Documentation/merge-options.txt3
-rw-r--r--Documentation/merge-strategies.txt2
-rw-r--r--Documentation/pretty-formats.txt2
-rw-r--r--Documentation/rev-list-options.txt11
-rw-r--r--Documentation/technical/api-object-access.txt2
-rw-r--r--Documentation/technical/http-protocol.txt3
-rw-r--r--Documentation/technical/long-running-process-protocol.txt50
-rw-r--r--Documentation/technical/pack-protocol.txt8
-rw-r--r--Documentation/technical/protocol-capabilities.txt8
-rw-r--r--Documentation/technical/repository-version.txt12
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--INSTALL25
-rw-r--r--Makefile111
l---------RelNotes2
-rw-r--r--apply.c147
-rw-r--r--blame.c35
-rw-r--r--builtin/add.c9
-rw-r--r--builtin/am.c63
-rw-r--r--builtin/archive.c2
-rw-r--r--builtin/blame.c20
-rw-r--r--builtin/branch.c2
-rw-r--r--builtin/cat-file.c6
-rw-r--r--builtin/check-ignore.c3
-rw-r--r--builtin/checkout-index.c2
-rw-r--r--builtin/checkout.c208
-rw-r--r--builtin/clean.c2
-rw-r--r--builtin/clone.c22
-rw-r--r--builtin/commit-tree.c4
-rw-r--r--builtin/commit.c315
-rw-r--r--builtin/config.c10
-rw-r--r--builtin/describe.c2
-rw-r--r--builtin/diff-tree.c2
-rw-r--r--builtin/fast-export.c8
-rw-r--r--builtin/fetch-pack.c18
-rw-r--r--builtin/fetch.c137
-rw-r--r--builtin/fsck.c30
-rw-r--r--builtin/gc.c10
-rw-r--r--builtin/grep.c48
-rw-r--r--builtin/hash-object.c3
-rw-r--r--builtin/help.c10
-rw-r--r--builtin/index-pack.c239
-rw-r--r--builtin/init-db.c30
-rw-r--r--builtin/log.c11
-rw-r--r--builtin/ls-remote.c5
-rw-r--r--builtin/merge.c68
-rw-r--r--builtin/mktag.c6
-rw-r--r--builtin/mktree.c14
-rw-r--r--builtin/mv.c7
-rw-r--r--builtin/notes.c12
-rw-r--r--builtin/pack-objects.c110
-rw-r--r--builtin/pack-redundant.c54
-rw-r--r--builtin/prune.c9
-rw-r--r--builtin/pull.c4
-rw-r--r--builtin/push.c2
-rw-r--r--builtin/rebase--helper.c4
-rw-r--r--builtin/receive-pack.c11
-rw-r--r--builtin/reflog.c9
-rw-r--r--builtin/remote.c68
-rw-r--r--builtin/repack.c8
-rw-r--r--builtin/replace.c49
-rw-r--r--builtin/reset.c28
-rw-r--r--builtin/rev-list.c73
-rw-r--r--builtin/rev-parse.c38
-rw-r--r--builtin/revert.c4
-rw-r--r--builtin/rm.c9
-rw-r--r--builtin/submodule--helper.c340
-rw-r--r--builtin/tag.c17
-rw-r--r--builtin/unpack-objects.c32
-rw-r--r--builtin/update-index.c3
-rw-r--r--builtin/update-server-info.c2
-rw-r--r--builtin/verify-commit.c2
-rw-r--r--builtin/worktree.c244
-rw-r--r--bulk-checkin.c30
-rw-r--r--cache-tree.c21
-rw-r--r--cache.h88
-rwxr-xr-xci/lib-travisci.sh9
-rwxr-xr-xci/run-build-and-tests.sh2
-rwxr-xr-xci/run-linux32-build.sh51
-rwxr-xr-xci/run-linux32-docker.sh7
-rw-r--r--color.c7
-rw-r--r--color.h34
-rw-r--r--combine-diff.c16
-rw-r--r--commit.c41
-rw-r--r--commit.h11
-rw-r--r--compat/mingw.c11
-rw-r--r--compat/mingw.h3
-rw-r--r--config.c12
-rw-r--r--connected.c2
-rw-r--r--contrib/coccinelle/strbuf.cocci3
-rw-r--r--contrib/completion/git-completion.bash325
-rw-r--r--contrib/examples/builtin-fetch--tool.c2
-rwxr-xr-xcontrib/examples/git-difftool.perl2
-rwxr-xr-xcontrib/examples/git-svnimport.perl2
-rwxr-xr-xcontrib/hooks/pre-auto-gc-battery2
-rwxr-xr-xcontrib/subtree/git-subtree.sh12
-rw-r--r--convert.c44
-rw-r--r--convert.h17
-rw-r--r--csum-file.c46
-rw-r--r--csum-file.h38
-rw-r--r--daemon.c46
-rw-r--r--diff-lib.c42
-rw-r--r--diff.c217
-rw-r--r--diff.h14
-rw-r--r--diffcore-delta.c16
-rw-r--r--diffcore-pickaxe.c48
-rw-r--r--diffcore-rename.c12
-rw-r--r--dir.c166
-rw-r--r--dir.h14