summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitattributes8
-rw-r--r--.gitignore1
-rw-r--r--.mailmap1
-rw-r--r--.travis.yml42
-rw-r--r--Documentation/CodingGuidelines12
-rw-r--r--Documentation/RelNotes/2.13.0.txt618
-rw-r--r--Documentation/RelNotes/2.13.1.txt114
-rw-r--r--Documentation/RelNotes/2.14.0.txt306
-rw-r--r--Documentation/SubmittingPatches24
-rw-r--r--Documentation/config.txt214
-rw-r--r--Documentation/diff-format.txt7
-rw-r--r--Documentation/diff-generate-patch.txt7
-rw-r--r--Documentation/diff-options.txt7
-rw-r--r--Documentation/git-apply.txt7
-rw-r--r--Documentation/git-archimport.txt2
-rw-r--r--Documentation/git-bisect-lk2009.txt18
-rw-r--r--Documentation/git-bisect.txt2
-rw-r--r--Documentation/git-branch.txt49
-rw-r--r--Documentation/git-checkout.txt7
-rw-r--r--Documentation/git-clone.txt28
-rw-r--r--Documentation/git-commit.txt13
-rw-r--r--Documentation/git-credential-cache.txt11
-rw-r--r--Documentation/git-describe.txt26
-rw-r--r--Documentation/git-diff.txt14
-rw-r--r--Documentation/git-filter-branch.txt5
-rw-r--r--Documentation/git-for-each-ref.txt104
-rw-r--r--Documentation/git-format-patch.txt2
-rw-r--r--Documentation/git-grep.txt7
-rw-r--r--Documentation/git-interpret-trailers.txt2
-rw-r--r--Documentation/git-ls-files.txt12
-rw-r--r--Documentation/git-ls-tree.txt10
-rw-r--r--Documentation/git-merge.txt7
-rw-r--r--Documentation/git-name-rev.txt13
-rw-r--r--Documentation/git-pull.txt11
-rw-r--r--Documentation/git-push.txt41
-rw-r--r--Documentation/git-read-tree.txt8
-rw-r--r--Documentation/git-rebase.txt5
-rw-r--r--Documentation/git-receive-pack.txt29
-rw-r--r--Documentation/git-repack.txt5
-rw-r--r--Documentation/git-rev-parse.txt22
-rw-r--r--Documentation/git-send-email.txt1
-rw-r--r--Documentation/git-send-pack.txt6
-rw-r--r--Documentation/git-stash.txt25
-rw-r--r--Documentation/git-status.txt20
-rw-r--r--Documentation/git-submodule.txt40
-rw-r--r--Documentation/git-svn.txt16
-rw-r--r--Documentation/git-tag.txt59
-rw-r--r--Documentation/git-tools.txt2
-rw-r--r--Documentation/git-update-index.txt43
-rw-r--r--Documentation/git-worktree.txt7
-rw-r--r--Documentation/git.txt510
-rw-r--r--Documentation/gitattributes.txt16
-rw-r--r--Documentation/gitcore-tutorial.txt2
-rw-r--r--Documentation/gitcredentials.txt20
-rw-r--r--Documentation/githooks.txt17
-rw-r--r--Documentation/gitmodules.txt35
-rw-r--r--Documentation/gitremote-helpers.txt2
-rw-r--r--Documentation/gitweb.conf.txt4
-rw-r--r--Documentation/gitweb.txt2
-rw-r--r--Documentation/glossary-content.txt27
-rw-r--r--Documentation/howto/rebuild-from-update-hook.txt4
-rw-r--r--Documentation/pretty-formats.txt2
-rw-r--r--Documentation/rev-list-options.txt8
-rw-r--r--Documentation/revisions.txt10
-rw-r--r--Documentation/technical/api-directory-listing.txt6
-rw-r--r--Documentation/technical/api-gitattributes.txt86
-rw-r--r--Documentation/technical/api-hashmap.txt22
-rw-r--r--Documentation/technical/api-oid-array.txt (renamed from Documentation/technical/api-sha1-array.txt)44
-rw-r--r--Documentation/technical/api-parse-options.txt13
-rw-r--r--Documentation/technical/api-sub-process.txt59
-rw-r--r--Documentation/technical/pack-protocol.txt39
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--Makefile72
l---------RelNotes2
-rw-r--r--abspath.c30
-rw-r--r--apply.c349
-rw-r--r--archive-tar.c7
-rw-r--r--archive-zip.c227
-rw-r--r--archive.c30
-rw-r--r--archive.h2
-rw-r--r--attr.c895
-rw-r--r--attr.h50
-rw-r--r--bisect.c62
-rw-r--r--blame.c1863
-rw-r--r--blame.h175
-rw-r--r--blob.c6
-rw-r--r--blob.h2
-rw-r--r--branch.c50
-rw-r--r--branch.h3
-rw-r--r--builtin.h3
-rw-r--r--builtin/add.c19
-rw-r--r--builtin/am.c142
-rw-r--r--builtin/blame.c2145
-rw-r--r--builtin/branch.c341
-rw-r--r--builtin/bundle.c8
-rw-r--r--builtin/cat-file.c24
-rw-r--r--builtin/check-attr.c66
-rw-r--r--builtin/check-ignore.c9
-rw-r--r--builtin/checkout.c75
-rw-r--r--builtin/clean.c62
-rw-r--r--builtin/clone.c79
-rw-r--r--builtin/commit-tree.c2
-rw-r--r--builtin/commit.c64
-rw-r--r--builtin/config.c35
-rw-r--r--builtin/count-objects.c4
-rw-r--r--builtin/describe.c163
-rw-r--r--builtin/diff-files.c2
-rw-r--r--builtin/diff-index.c2
-rw-r--r--builtin/diff-tree.c65
-rw-r--r--builtin/diff.c96
-rw-r--r--builtin/difftool.c118
-rw-r--r--builtin/fast-export.c62
-rw-r--r--builtin/fetch-pack.c2
-rw-r--r--builtin/fetch.c21
-rw-r--r--builtin/fmt-merge-msg.c68
-rw-r--r--builtin/for-each-ref.c5
-rw-r--r--builtin/fsck.c61
-rw-r--r--builtin/gc.c39
-rw-r--r--builtin/grep.c116
-rw-r--r--builtin/hash-object.c10
-rw-r--r--builtin/index-pack.c78
-rw-r--r--builtin/log.c41
-rw-r--r--builtin/ls-files.c91
-rw-r--r--builtin/ls-remote.c10
-rw-r--r--builtin/ls-tree.c6
-rw-r--r--builtin/mailinfo.c11
-rw-r--r--builtin/mailsplit.c10
-rw-r--r--builtin/merge-base.c32
-rw-r--r--builtin/merge-file.c18
-rw-r--r--builtin/merge-index.c2
-rw-r--r--