summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--.mailmap1
-rw-r--r--Documentation/CodingGuidelines4
-rw-r--r--Documentation/RelNotes/2.3.2.txt79
-rw-r--r--Documentation/RelNotes/2.3.3.txt39
-rw-r--r--Documentation/RelNotes/2.3.4.txt32
-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.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.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.5.0.txt563
-rw-r--r--Documentation/RelNotes/2.5.1.txt49
-rw-r--r--Documentation/SubmittingPatches5
-rw-r--r--Documentation/blame-options.txt4
-rwxr-xr-xDocumentation/cmd-list.perl4
-rw-r--r--Documentation/config.txt460
-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.txt3
-rw-r--r--Documentation/git-apply.txt14
-rw-r--r--Documentation/git-blame.txt2
-rw-r--r--Documentation/git-branch.txt14
-rw-r--r--Documentation/git-cat-file.txt104
-rw-r--r--Documentation/git-check-ignore.txt2
-rw-r--r--Documentation/git-checkout.txt31
-rw-r--r--Documentation/git-cherry-pick.txt3
-rw-r--r--Documentation/git-clean.txt8
-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-describe.txt2
-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-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.txt6
-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-imap-send.txt3
-rw-r--r--Documentation/git-init.txt2
-rw-r--r--Documentation/git-instaweb.txt2
-rw-r--r--Documentation/git-log.txt6
-rw-r--r--Documentation/git-merge.txt8
-rw-r--r--Documentation/git-p4.txt17
-rw-r--r--Documentation/git-pack-objects.txt2
-rw-r--r--Documentation/git-pull.txt10
-rw-r--r--Documentation/git-push.txt23
-rw-r--r--Documentation/git-rebase.txt12
-rw-r--r--Documentation/git-receive-pack.txt2
-rw-r--r--Documentation/git-reflog.txt144
-rw-r--r--Documentation/git-remote.txt3
-rw-r--r--Documentation/git-repack.txt4
-rw-r--r--Documentation/git-rerere.txt2
-rw-r--r--Documentation/git-rev-list.txt97
-rw-r--r--Documentation/git-rev-parse.txt18
-rw-r--r--Documentation/git-send-email.txt69
-rw-r--r--Documentation/git-send-pack.txt2
-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.txt116
-rw-r--r--Documentation/git-svn.txt10
-rw-r--r--Documentation/git-tag.txt16
-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-verify-pack.txt2
-rw-r--r--Documentation/git-worktree.txt176
-rw-r--r--Documentation/git.txt54
-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/gitignore.txt4
-rw-r--r--Documentation/gitk.txt4
-rw-r--r--Documentation/gitmodules.txt21
-rw-r--r--Documentation/gitremote-helpers.txt14
-rw-r--r--Documentation/gitrepository-layout.txt74
-rw-r--r--Documentation/gitweb.conf.txt6
-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.txt8
-rw-r--r--Documentation/pretty-formats.txt5
-rw-r--r--Documentation/pretty-options.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
-rw-r--r--Documentation/technical/racy-git.txt8
-rw-r--r--Documentation/user-manual.txt2
-rwxr-xr-xGIT-VERSION-GEN4
-rw-r--r--Makefile80
l---------[-rw-r--r--]RelNotes172
-rw-r--r--archive-zip.c31
-rw-r--r--archive.c22
-rw-r--r--attr.c16
-rw-r--r--bisect.c46
-rw-r--r--branch.c5
-rw-r--r--builtin.h1
-rw-r--r--builtin/add.c5
-rw-r--r--builtin/apply.c166
-rw-r--r--builtin/blame.c28
-rw-r--r--