summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--Documentation/CodingGuidelines21
-rw-r--r--Documentation/RelNotes/2.4.0.txt514
-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.txt445
-rw-r--r--Documentation/blame-options.txt2
-rwxr-xr-xDocumentation/cmd-list.perl4
-rw-r--r--Documentation/config.txt335
-rw-r--r--Documentation/diff-config.txt10
-rw-r--r--Documentation/diff-generate-patch.txt2
-rw-r--r--Documentation/diff-options.txt33
-rw-r--r--Documentation/fetch-options.txt2
-rw-r--r--Documentation/fmt-merge-msg-config.txt10
-rw-r--r--Documentation/git-add.txt7
-rw-r--r--Documentation/git-am.txt7
-rw-r--r--Documentation/git-apply.txt2
-rw-r--r--Documentation/git-blame.txt2
-rw-r--r--Documentation/git-branch.txt6
-rw-r--r--Documentation/git-cat-file.txt104
-rw-r--r--Documentation/git-check-ignore.txt2
-rw-r--r--Documentation/git-checkout.txt82
-rw-r--r--Documentation/git-commit-tree.txt2
-rw-r--r--Documentation/git-commit.txt19
-rw-r--r--Documentation/git-config.txt2
-rw-r--r--Documentation/git-credential-store.txt35
-rw-r--r--Documentation/git-cvsserver.txt22
-rw-r--r--Documentation/git-fast-export.txt6
-rw-r--r--Documentation/git-fast-import.txt30
-rw-r--r--Documentation/git-fetch-pack.txt2
-rw-r--r--Documentation/git-fetch.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.txt4
-rw-r--r--Documentation/git-gc.txt12
-rw-r--r--Documentation/git-hash-object.txt10
-rw-r--r--Documentation/git-http-backend.txt13
-rw-r--r--Documentation/git-init.txt2
-rw-r--r--Documentation/git-instaweb.txt2
-rw-r--r--Documentation/git-log.txt2
-rw-r--r--Documentation/git-merge.txt8
-rw-r--r--Documentation/git-p4.txt23
-rw-r--r--Documentation/git-pack-objects.txt2
-rw-r--r--Documentation/git-prune.txt3
-rw-r--r--Documentation/git-pull.txt5
-rw-r--r--Documentation/git-push.txt16
-rw-r--r--Documentation/git-rebase.txt8
-rw-r--r--Documentation/git-receive-pack.txt2
-rw-r--r--Documentation/git-reflog.txt144
-rw-r--r--Documentation/git-repack.txt4
-rw-r--r--Documentation/git-rerere.txt2
-rw-r--r--Documentation/git-rev-list.txt96
-rw-r--r--Documentation/git-rev-parse.txt14
-rw-r--r--Documentation/git-send-email.txt69
-rw-r--r--Documentation/git-send-pack.txt9
-rw-r--r--Documentation/git-show.txt2
-rw-r--r--Documentation/git-status.txt17
-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.txt15
-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.txt20
-rw-r--r--Documentation/gitattributes.txt7
-rw-r--r--Documentation/gitcore-tutorial.txt2
-rw-r--r--Documentation/gitcredentials.txt2
-rw-r--r--Documentation/gitdiffcore.txt6
-rw-r--r--Documentation/githooks.txt30
-rw-r--r--Documentation/gitignore.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/merge-config.txt8
-rw-r--r--Documentation/pretty-formats.txt5
-rw-r--r--Documentation/pretty-options.txt10
-rw-r--r--Documentation/rev-list-options.txt17
-rw-r--r--Documentation/revisions.txt25
-rw-r--r--Documentation/technical/api-error-handling.txt75
-rw-r--r--Documentation/technical/api-ref-iteration.txt2
-rw-r--r--Documentation/technical/api-remote.txt4
-rw-r--r--Documentation/technical/api-strbuf.txt351
-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.txt20
-rw-r--r--Documentation/user-manual.txt2
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--Makefile87
l---------RelNotes2
-rw-r--r--advice.c2
-rw-r--r--archive-zip.c29
-rw-r--r--archive.c26
-rw-r--r--attr.c63
-rw-r--r--bisect.c46
-rw-r--r--branch.c5
-rw-r--r--builtin/add.c6
-rw-r--r--builtin/apply.c26
-rw-r--r--builtin/blame.c30
-rw-r--r--builtin/branch.c59
-rw-r--r--builtin/bundle.c8
-rw-r--r--builtin/cat-file.c102
-rw-r--r--builtin/check-attr.c4
-rw-r--r--builtin/check-ignore.c4
-rw-r--r--builtin/check-mailmap.c2
-rw-r--r--builtin/check-ref-format.c2
-rw-r--r--builtin/checkout-index.c12
-rw-r--r--builtin/checkout.c290
-rw-r--r--builtin/clean.c11
-rw-r--r--builtin/clone.c32
-rw-r--r--builtin/column.c2
-rw-r--r--builtin/commit.c29
-rw-r--r--builtin/config.c12
-rw-r--r--builtin/count-objects.c4
-rw-r--r--builtin/describe.c16
-rw-r--r--builtin/diff-files.c2
-rw-r--r--builtin/diff-index.c2
-rw-r--r--builtin/diff-tree.c2
-rw-r--r--builtin/fetch-pack.c2
-rw-r--r--builtin/fetch.c26
-rw-r--r--builtin/fmt-merge-msg.c18
-rw-r--r--builtin/for-each-ref.c39
-rw-r--r--builtin/fsck.c60
-rw-r--r--builtin/gc.c