summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--.mailmap7
-rw-r--r--.travis.yml32
-rw-r--r--Documentation/Makefile22
-rw-r--r--Documentation/RelNotes/2.12.0.txt500
-rw-r--r--Documentation/RelNotes/2.12.1.txt41
-rw-r--r--Documentation/RelNotes/2.12.2.txt83
-rw-r--r--Documentation/RelNotes/2.12.3.txt57
-rw-r--r--Documentation/RelNotes/2.13.0.txt476
-rw-r--r--Documentation/SubmittingPatches25
-rw-r--r--Documentation/asciidoctor-extensions.rb28
-rw-r--r--Documentation/blame-options.txt4
-rwxr-xr-xDocumentation/cat-texi.perl21
-rw-r--r--Documentation/config.txt274
-rw-r--r--Documentation/diff-config.txt19
-rw-r--r--Documentation/diff-format.txt7
-rw-r--r--Documentation/diff-generate-patch.txt7
-rw-r--r--Documentation/diff-heuristic-options.txt2
-rw-r--r--Documentation/diff-options.txt43
-rw-r--r--Documentation/git-apply.txt7
-rw-r--r--Documentation/git-bisect.txt2
-rw-r--r--Documentation/git-branch.txt56
-rw-r--r--Documentation/git-check-ref-format.txt6
-rw-r--r--Documentation/git-checkout.txt7
-rw-r--r--Documentation/git-clone.txt14
-rw-r--r--Documentation/git-commit.txt11
-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-difftool.txt5
-rw-r--r--Documentation/git-filter-branch.txt14
-rw-r--r--Documentation/git-for-each-ref.txt109
-rw-r--r--Documentation/git-format-patch.txt2
-rw-r--r--Documentation/git-gc.txt2
-rw-r--r--Documentation/git-grep.txt14
-rw-r--r--Documentation/git-gui.txt2
-rw-r--r--Documentation/git-init.txt4
-rw-r--r--Documentation/git-ls-files.txt12
-rw-r--r--Documentation/git-ls-tree.txt10
-rw-r--r--Documentation/git-merge.txt15
-rw-r--r--Documentation/git-name-rev.txt13
-rw-r--r--Documentation/git-p4.txt15
-rw-r--r--Documentation/git-push.txt13
-rw-r--r--Documentation/git-read-tree.txt6
-rw-r--r--Documentation/git-rebase.txt7
-rw-r--r--Documentation/git-relink.txt30
-rw-r--r--Documentation/git-reset.txt48
-rw-r--r--Documentation/git-rev-parse.txt13
-rw-r--r--Documentation/git-send-email.txt2
-rw-r--r--Documentation/git-send-pack.txt6
-rw-r--r--Documentation/git-shortlog.txt4
-rw-r--r--Documentation/git-stash.txt30
-rw-r--r--Documentation/git-status.txt20
-rw-r--r--Documentation/git-submodule.txt123
-rw-r--r--Documentation/git-tag.txt75
-rw-r--r--Documentation/git-update-index.txt43
-rw-r--r--Documentation/git-verify-tag.txt2
-rw-r--r--Documentation/git-worktree.txt2
-rw-r--r--Documentation/git.txt51
-rw-r--r--Documentation/gitattributes.txt10
-rw-r--r--Documentation/gitcore-tutorial.txt2
-rw-r--r--Documentation/gitcvs-migration.txt2
-rw-r--r--Documentation/gitdiffcore.txt12
-rw-r--r--Documentation/giteveryday.txt17
-rw-r--r--Documentation/gitglossary.txt2
-rw-r--r--Documentation/gitk.txt14
-rw-r--r--Documentation/gitremote-helpers.txt10
-rw-r--r--Documentation/gitrepository-layout.txt2
-rw-r--r--Documentation/gittutorial-2.txt2
-rw-r--r--Documentation/gittutorial.txt2
-rw-r--r--Documentation/gitworkflows.txt2
-rw-r--r--Documentation/glossary-content.txt27
-rw-r--r--Documentation/pretty-formats.txt2
-rw-r--r--Documentation/rev-list-options.txt4
-rw-r--r--Documentation/revisions.txt6
-rw-r--r--Documentation/technical/api-gitattributes.txt86
-rw-r--r--Documentation/technical/api-hashmap.txt26
-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.txt5
-rw-r--r--Documentation/technical/api-setup.txt2
-rw-r--r--Documentation/technical/api-submodule-config.txt14
-rw-r--r--Documentation/texi.xsl26
-rw-r--r--Documentation/user-manual.txt8
-rwxr-xr-xGIT-VERSION-GEN4
-rw-r--r--Makefile87
-rw-r--r--README.md6
l---------RelNotes2
-rw-r--r--abspath.c268
-rw-r--r--apply.c36
-rw-r--r--archive.c24
-rw-r--r--attr.c895
-rw-r--r--attr.h50
-rw-r--r--bisect.c62
-rw-r--r--branch.c23
-rw-r--r--branch.h3
-rw-r--r--builtin.h2
-rw-r--r--builtin/add.c2
-rw-r--r--builtin/am.c10
-rw-r--r--builtin/blame.c38
-rw-r--r--builtin/branch.c363
-rw-r--r--builtin/bundle.c8
-rw-r--r--builtin/cat-file.c18
-rw-r--r--builtin/check-attr.c66
-rw-r--r--builtin/checkout-index.c2
-rw-r--r--builtin/checkout.c54
-rw-r--r--builtin/clean.c26
-rw-r--r--builtin/clone.c68
-rw-r--r--builtin/commit.c85
-rw-r--r--builtin/config.c4
-rw-r--r--builtin/count-objects.c4
-rw-r--r--builtin/describe.c163
-rw-r--r--builtin/diff-tree.c67
-rw-r--r--builtin/diff.c47
-rw-r--r--builtin/difftool.c735
-rw-r--r--builtin/fast-export.c58
-rw-r--r--builtin/fetch-pack.c9
-rw-r--r--builtin/fetch.c16
-rw-r--r--builtin/fmt-merge-msg.c70
-rw-r--r--builtin/for-each-ref.c10
-rw-r--r--builtin/fsck.c182
-rw-r--r--builtin/gc.c25
-rw-r--r--builtin/grep.c499
-rw-r--r--builtin/hash-object.c10
-rw-r--r--builtin/index-pack.c55
-rw-r--r--builtin/init-db.c8
-rw-r--r--builtin/log.c17
-rw-r--r--builtin/ls-files.c62
-rw-r--r--builtin/ls-remote.c10
-rw-r--r--builtin/ls-tree.c16
-rw-r--r--builtin/mailinfo.c11