summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore3
-rw-r--r--Documentation/RelNotes/2.2.3.txt9
-rw-r--r--Documentation/RelNotes/2.3.8.txt22
-rw-r--r--Documentation/RelNotes/2.3.9.txt9
-rw-r--r--Documentation/RelNotes/2.4.1.txt40
-rw-r--r--Documentation/RelNotes/2.4.2.txt45
-rw-r--r--Documentation/RelNotes/2.4.3.txt76
-rw-r--r--Documentation/RelNotes/2.4.4.txt35
-rw-r--r--Documentation/RelNotes/2.4.5.txt28
-rw-r--r--Documentation/RelNotes/2.4.6.txt23
-rw-r--r--Documentation/RelNotes/2.4.7.txt53
-rw-r--r--Documentation/RelNotes/2.4.8.txt21
-rw-r--r--Documentation/RelNotes/2.4.9.txt9
-rw-r--r--Documentation/RelNotes/2.5.0.txt563
-rw-r--r--Documentation/RelNotes/2.5.1.txt65
-rw-r--r--Documentation/RelNotes/2.5.2.txt63
-rw-r--r--Documentation/RelNotes/2.6.0.txt359
-rw-r--r--Documentation/blame-options.txt2
-rw-r--r--Documentation/config.txt218
-rw-r--r--Documentation/diff-generate-patch.txt2
-rw-r--r--Documentation/diff-options.txt29
-rw-r--r--Documentation/fmt-merge-msg-config.txt10
-rw-r--r--Documentation/git-add.txt3
-rw-r--r--Documentation/git-am.txt7
-rw-r--r--Documentation/git-bisect.txt133
-rw-r--r--Documentation/git-blame.txt2
-rw-r--r--Documentation/git-branch.txt8
-rw-r--r--Documentation/git-cat-file.txt118
-rw-r--r--Documentation/git-check-ref-format.txt4
-rw-r--r--Documentation/git-checkout.txt27
-rw-r--r--Documentation/git-commit.txt13
-rw-r--r--Documentation/git-config.txt10
-rw-r--r--Documentation/git-credential-store.txt35
-rw-r--r--Documentation/git-describe.txt6
-rw-r--r--Documentation/git-fast-export.txt6
-rw-r--r--Documentation/git-fast-import.txt69
-rw-r--r--Documentation/git-fetch-pack.txt2
-rw-r--r--Documentation/git-fmt-merge-msg.txt12
-rw-r--r--Documentation/git-for-each-ref.txt6
-rw-r--r--Documentation/git-format-patch.txt2
-rw-r--r--Documentation/git-fsck.txt7
-rw-r--r--Documentation/git-hash-object.txt10
-rw-r--r--Documentation/git-http-backend.txt13
-rw-r--r--Documentation/git-log.txt10
-rw-r--r--Documentation/git-merge.txt4
-rw-r--r--Documentation/git-notes.txt25
-rw-r--r--Documentation/git-p4.txt17
-rw-r--r--Documentation/git-pack-objects.txt2
-rw-r--r--Documentation/git-pull.txt3
-rw-r--r--Documentation/git-push.txt19
-rw-r--r--Documentation/git-rebase.txt18
-rw-r--r--Documentation/git-reflog.txt4
-rw-r--r--Documentation/git-rev-list.txt97
-rw-r--r--Documentation/git-rev-parse.txt18
-rw-r--r--Documentation/git-send-email.txt44
-rw-r--r--Documentation/git-send-pack.txt18
-rw-r--r--Documentation/git-show.txt2
-rw-r--r--Documentation/git-status.txt5
-rw-r--r--Documentation/git-stripspace.txt6
-rw-r--r--Documentation/git-submodule.txt50
-rw-r--r--Documentation/git-svn.txt13
-rw-r--r--Documentation/git-tag.txt8
-rw-r--r--Documentation/git-tools.txt124
-rw-r--r--Documentation/git-unpack-objects.txt6
-rw-r--r--Documentation/git-update-index.txt14
-rw-r--r--Documentation/git-update-ref.txt5
-rw-r--r--Documentation/git-verify-commit.txt4
-rw-r--r--Documentation/git-verify-pack.txt2
-rw-r--r--Documentation/git-verify-tag.txt4
-rw-r--r--Documentation/git-worktree.txt176
-rw-r--r--Documentation/git.txt49
-rw-r--r--Documentation/gitattributes.txt7
-rw-r--r--Documentation/gitcore-tutorial.txt2
-rw-r--r--Documentation/gitdiffcore.txt6
-rw-r--r--Documentation/gitk.txt4
-rw-r--r--Documentation/gitremote-helpers.txt17
-rw-r--r--Documentation/gitrepository-layout.txt74
-rw-r--r--Documentation/gitweb.conf.txt2
-rw-r--r--Documentation/glossary-content.txt37
-rw-r--r--Documentation/i18n.txt33
-rw-r--r--Documentation/line-range-format.txt11
-rw-r--r--Documentation/merge-config.txt6
-rw-r--r--Documentation/pretty-formats.txt7
-rw-r--r--Documentation/pretty-options.txt7
-rw-r--r--Documentation/rev-list-options.txt7
-rw-r--r--Documentation/revisions.txt25
-rw-r--r--Documentation/technical/api-argv-array.txt3
-rw-r--r--Documentation/technical/api-lockfile.txt220
-rw-r--r--Documentation/technical/api-parse-options.txt19
-rw-r--r--Documentation/technical/api-ref-iteration.txt2
-rw-r--r--Documentation/technical/api-remote.txt4
-rw-r--r--Documentation/technical/api-submodule-config.txt62
-rw-r--r--Documentation/technical/http-protocol.txt3
-rw-r--r--Documentation/technical/index-format.txt62
-rw-r--r--Documentation/technical/pack-protocol.txt62
-rw-r--r--Documentation/technical/protocol-capabilities.txt7
-rw-r--r--Documentation/technical/protocol-common.txt5
-rw-r--r--Documentation/technical/racy-git.txt8
-rwxr-xr-xGIT-VERSION-GEN4
-rw-r--r--Makefile73
l---------RelNotes2
-rw-r--r--advice.c8
-rw-r--r--advice.h1
-rw-r--r--alias.c3
-rw-r--r--archive-zip.c103
-rw-r--r--archive.c25
-rw-r--r--argv-array.c6
-rw-r--r--argv-array.h1
-rw-r--r--attr.c20
-rw-r--r--bisect.c165
-rw-r--r--bisect.h2
-rw-r--r--branch.c103
-rw-r--r--branch.h15
-rw-r--r--builtin.h3
-rw-r--r--builtin/add.c5
-rw-r--r--builtin/am.c2411
-rw-r--r--builtin/apply.c19
-rw-r--r--builtin/blame.c49
-rw-r--r--builtin/branch.c43
-rw-r--r--builtin/bundle.c8
-rw-r--r--builtin/cat-file.c216
-rw-r--r--builtin/checkout-index.c10
-rw-r--r--builtin/checkout.c71
-rw-r--r--builtin/clean.c38
-rw-r--r--builtin/clone.c173
-rw-r--r--builtin/commit.c70
-rw-r--r--builtin/config.c100
-rw-r--r--builtin/count-objects.c4
-rw-r--r--