summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--.mailmap2
-rw-r--r--.travis.yml11
-rw-r--r--Documentation/RelNotes/2.10.0.txt675
-rw-r--r--Documentation/RelNotes/2.10.1.txt131
-rw-r--r--Documentation/RelNotes/2.10.2.txt111
-rw-r--r--Documentation/RelNotes/2.10.3.txt48
-rw-r--r--Documentation/RelNotes/2.11.0.txt593
-rw-r--r--Documentation/RelNotes/2.3.10.txt2
-rw-r--r--Documentation/RelNotes/2.4.10.txt2
-rw-r--r--Documentation/RelNotes/2.5.4.txt2
-rw-r--r--Documentation/RelNotes/2.6.1.txt2
-rw-r--r--Documentation/blame-options.txt5
-rw-r--r--Documentation/config.txt188
-rw-r--r--Documentation/diff-config.txt22
-rw-r--r--Documentation/diff-heuristic-options.txt7
-rw-r--r--Documentation/diff-options.txt37
-rw-r--r--Documentation/fetch-options.txt14
-rw-r--r--Documentation/git-add.txt7
-rw-r--r--Documentation/git-am.txt3
-rw-r--r--Documentation/git-annotate.txt1
-rw-r--r--Documentation/git-blame.txt4
-rw-r--r--Documentation/git-cat-file.txt40
-rw-r--r--Documentation/git-check-ref-format.txt4
-rw-r--r--Documentation/git-checkout.txt12
-rw-r--r--Documentation/git-clone.txt13
-rw-r--r--Documentation/git-commit.txt6
-rw-r--r--Documentation/git-count-objects.txt5
-rw-r--r--Documentation/git-cvsimport.txt2
-rw-r--r--Documentation/git-fast-import.txt2
-rw-r--r--Documentation/git-fetch-pack.txt14
-rw-r--r--Documentation/git-fetch.txt51
-rw-r--r--Documentation/git-fmt-merge-msg.txt4
-rw-r--r--Documentation/git-format-patch.txt8
-rw-r--r--Documentation/git-fsck.txt9
-rw-r--r--Documentation/git-index-pack.txt2
-rw-r--r--Documentation/git-interpret-trailers.txt15
-rw-r--r--Documentation/git-log.txt4
-rw-r--r--Documentation/git-ls-files.txt10
-rw-r--r--Documentation/git-mailsplit.txt7
-rw-r--r--Documentation/git-merge-base.txt26
-rw-r--r--Documentation/git-mergetool.txt7
-rw-r--r--Documentation/git-push.txt8
-rw-r--r--Documentation/git-receive-pack.txt3
-rw-r--r--Documentation/git-remote-fd.txt2
-rw-r--r--Documentation/git-repack.txt13
-rw-r--r--Documentation/git-stash.txt3
-rw-r--r--Documentation/git-status.txt133
-rw-r--r--Documentation/git-submodule.txt15
-rw-r--r--Documentation/git-svn.txt3
-rw-r--r--Documentation/git-tag.txt5
-rw-r--r--Documentation/git-unpack-objects.txt3
-rw-r--r--Documentation/git-upload-pack.txt16
-rw-r--r--Documentation/git-worktree.txt49
-rw-r--r--Documentation/git.txt26
-rw-r--r--Documentation/gitattributes.txt219
-rw-r--r--Documentation/gitcvs-migration.txt6
-rw-r--r--Documentation/githooks.txt18
-rw-r--r--Documentation/gitk.txt2
-rw-r--r--Documentation/gitmodules.txt12
-rw-r--r--Documentation/gitremote-helpers.txt11
-rw-r--r--Documentation/gitrepository-layout.txt2
-rw-r--r--Documentation/gitrevisions.txt6
-rw-r--r--Documentation/gitweb.conf.txt21
-rw-r--r--Documentation/howto/revert-a-faulty-merge.txt16
-rw-r--r--Documentation/pretty-formats.txt15
-rw-r--r--Documentation/rev-list-options.txt13
-rw-r--r--Documentation/revisions.txt138
-rw-r--r--Documentation/technical/api-sha1-array.txt8
-rw-r--r--Documentation/technical/pack-protocol.txt14
-rw-r--r--Documentation/technical/protocol-capabilities.txt34
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--Makefile79
l---------RelNotes2
-rw-r--r--advice.c23
-rw-r--r--apply.c4988
-rw-r--r--apply.h137
-rw-r--r--archive-tar.c77
-rw-r--r--archive.c20
-rw-r--r--archive.h2
-rw-r--r--attr.c6
-rw-r--r--bisect.c65
-rw-r--r--branch.c5
-rw-r--r--branch.h22
-rw-r--r--builtin.h2
-rw-r--r--builtin/add.c47
-rw-r--r--builtin/am.c411
-rw-r--r--builtin/apply.c4661
-rw-r--r--builtin/archive.c10
-rw-r--r--builtin/blame.c175
-rw-r--r--builtin/branch.c38
-rw-r--r--builtin/cat-file.c178
-rw-r--r--builtin/checkout-index.c2
-rw-r--r--builtin/checkout.c100
-rw-r--r--builtin/clone.c158
-rw-r--r--builtin/commit-tree.c20
-rw-r--r--builtin/commit.c109
-rw-r--r--builtin/config.c7
-rw-r--r--builtin/count-objects.c12
-rw-r--r--builtin/describe.c2
-rw-r--r--builtin/diff.c27
-rw-r--r--builtin/fast-export.c12
-rw-r--r--builtin/fetch-pack.c27
-rw-r--r--builtin/fetch.c278
-rw-r--r--builtin/fmt-merge-msg.c14
-rw-r--r--builtin/fsck.c94
-rw-r--r--builtin/gc.c2
-rw-r--r--builtin/grep.c3
-rw-r--r--builtin/hash-object.c13
-rw-r--r--builtin/help.c30
-rw-r--r--builtin/index-pack.c26
-rw-r--r--builtin/init-db.c126
-rw-r--r--builtin/interpret-trailers.c2
-rw-r--r--builtin/log.c176
-rw-r--r--builtin/ls-files.c184
-rw-r--r--builtin/mailinfo.c19
-rw-r--r--builtin/mailsplit.c18
-rw-r--r--builtin/merge-base.c3
-rw-r--r--builtin/merge-index.c2
-rw-r--r--builtin/merge-recursive.c39
-rw-r--r--builtin/merge.c87
-rw-r--r--builtin/mktree.c2
-rw-r--r--builtin/mv.c2
-rw-r--r--builtin/name-rev.c3
-rw-r--r--builtin/notes.c89
-rw-r--r--builtin/pack-objects.c297
-rw-r--r--builtin/pull.c76
-rw-r--r--builtin/push.c21
-rw-r--r--builtin/read-tree.c2
-rw-r--r--builtin/receive-pack.c324
-rw-r--r--