summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--.mailmap1
-rw-r--r--Documentation/CodingGuidelines2
-rw-r--r--Documentation/RelNotes/2.3.2.txt2
-rw-r--r--Documentation/RelNotes/2.3.5.txt44
-rw-r--r--Documentation/RelNotes/2.3.6.txt13
-rw-r--r--Documentation/RelNotes/2.3.7.txt21
-rw-r--r--Documentation/RelNotes/2.3.8.txt22
-rw-r--r--Documentation/RelNotes/2.4.0.txt362
-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.5.0.txt508
-rw-r--r--Documentation/SubmittingPatches5
-rw-r--r--Documentation/blame-options.txt2
-rwxr-xr-xDocumentation/cmd-list.perl4
-rw-r--r--Documentation/config.txt61
-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-blame.txt2
-rw-r--r--Documentation/git-cat-file.txt104
-rw-r--r--Documentation/git-checkout.txt78
-rw-r--r--Documentation/git-cherry-pick.txt3
-rw-r--r--Documentation/git-commit.txt13
-rw-r--r--Documentation/git-credential-store.txt35
-rw-r--r--Documentation/git-fast-export.txt6
-rw-r--r--Documentation/git-fast-import.txt34
-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-hash-object.txt10
-rw-r--r--Documentation/git-http-backend.txt13
-rw-r--r--Documentation/git-log.txt4
-rw-r--r--Documentation/git-merge.txt4
-rw-r--r--Documentation/git-p4.txt17
-rw-r--r--Documentation/git-pack-objects.txt2
-rw-r--r--Documentation/git-prune.txt3
-rw-r--r--Documentation/git-pull.txt8
-rw-r--r--Documentation/git-push.txt18
-rw-r--r--Documentation/git-rebase.txt6
-rw-r--r--Documentation/git-rev-list.txt96
-rw-r--r--Documentation/git-rev-parse.txt14
-rw-r--r--Documentation/git-send-email.txt19
-rw-r--r--Documentation/git-send-pack.txt2
-rw-r--r--Documentation/git-show.txt2
-rw-r--r--Documentation/git-status.txt13
-rw-r--r--Documentation/git-stripspace.txt6
-rw-r--r--Documentation/git-submodule.txt50
-rw-r--r--Documentation/git-svn.txt10
-rw-r--r--Documentation/git-tag.txt13
-rw-r--r--Documentation/git-unpack-objects.txt6
-rw-r--r--Documentation/git-update-index.txt14
-rw-r--r--Documentation/git-verify-pack.txt2
-rw-r--r--Documentation/git.txt38
-rw-r--r--Documentation/gitattributes.txt5
-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.txt14
-rw-r--r--Documentation/gitrepository-layout.txt74
-rw-r--r--Documentation/gitweb.conf.txt2
-rw-r--r--Documentation/glossary-content.txt16
-rw-r--r--Documentation/howto/new-command.txt4
-rw-r--r--Documentation/howto/recover-corrupted-object-harder.txt237
-rw-r--r--Documentation/line-range-format.txt11
-rw-r--r--Documentation/merge-config.txt6
-rw-r--r--Documentation/pretty-formats.txt5
-rw-r--r--Documentation/rev-list-options.txt13
-rw-r--r--Documentation/revisions.txt25
-rw-r--r--Documentation/technical/api-error-handling.txt2
-rw-r--r--Documentation/technical/api-ref-iteration.txt2
-rw-r--r--Documentation/technical/api-remote.txt4
-rw-r--r--Documentation/technical/http-protocol.txt3
-rw-r--r--Documentation/technical/index-format.txt62
-rw-r--r--Documentation/technical/pack-protocol.txt16
-rw-r--r--Documentation/technical/protocol-capabilities.txt7
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--Makefile64
l---------RelNotes2
-rw-r--r--archive-zip.c4
-rw-r--r--archive.c22
-rw-r--r--attr.c16
-rw-r--r--bisect.c46
-rw-r--r--builtin/add.c3
-rw-r--r--builtin/apply.c21
-rw-r--r--builtin/blame.c28
-rw-r--r--builtin/branch.c38
-rw-r--r--builtin/bundle.c8
-rw-r--r--builtin/cat-file.c102
-rw-r--r--builtin/checkout-index.c10
-rw-r--r--builtin/checkout.c284
-rw-r--r--builtin/clean.c8
-rw-r--r--builtin/clone.c41
-rw-r--r--builtin/commit.c21
-rw-r--r--builtin/config.c14
-rw-r--r--builtin/count-objects.c4
-rw-r--r--builtin/describe.c12
-rw-r--r--builtin/fetch.c20
-rw-r--r--builtin/fmt-merge-msg.c16
-rw-r--r--builtin/for-each-ref.c42
-rw-r--r--builtin/fsck.c58
-rw-r--r--builtin/gc.c34
-rw-r--r--builtin/grep.c4
-rw-r--r--builtin/hash-object.c4
-rw-r--r--builtin/index-pack.c296
-rw-r--r--builtin/init-db.c25
-rw-r--r--builtin/log.c21
-rw-r--r--builtin/ls-files.c43
-rw-r--r--builtin/merge.c250
-rw-r--r--builtin/name-rev.c6
-rw-r--r--builtin/pack-objects.c18
-rw-r--r--builtin/patch-id.c34
-rw-r--r--builtin/prune.c100
-rw-r--r--builtin/receive-pack.c28
-rw-r--r--builtin/reflog.c9
-rw-r--r--builtin/remote.c23
-rw-r--r--builtin/repack.c16
-rw-r--r--builtin/replace.c16
-rw-r--r--builtin/rev-parse.c19
-rw-r--r--builtin/rm.c3
-rw-r--r--builtin/show-branch.c79
-rw-r--r--builtin/show-ref.c28
-rw-r--r--builtin/tag.c18
-rw-r--r--builtin/update-index.c202
-rw-r--r-