summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--.mailmap2
-rw-r--r--Documentation/RelNotes/2.2.3.txt9
-rw-r--r--Documentation/RelNotes/2.3.9.txt9
-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.txt232
-rw-r--r--Documentation/RelNotes/2.5.1.txt65
-rw-r--r--Documentation/RelNotes/2.5.2.txt63
-rw-r--r--Documentation/RelNotes/2.5.3.txt17
-rw-r--r--Documentation/RelNotes/2.6.0.txt370
-rw-r--r--Documentation/config.txt191
-rw-r--r--Documentation/fmt-merge-msg-config.txt10
-rw-r--r--Documentation/git-am.txt7
-rw-r--r--Documentation/git-bisect.txt236
-rw-r--r--Documentation/git-blame.txt2
-rw-r--r--Documentation/git-branch.txt12
-rw-r--r--Documentation/git-cat-file.txt14
-rw-r--r--Documentation/git-check-ref-format.txt4
-rw-r--r--Documentation/git-checkout.txt93
-rw-r--r--Documentation/git-config.txt10
-rw-r--r--Documentation/git-describe.txt6
-rw-r--r--Documentation/git-fast-import.txt39
-rw-r--r--Documentation/git-fmt-merge-msg.txt12
-rw-r--r--Documentation/git-for-each-ref.txt16
-rw-r--r--Documentation/git-format-patch.txt4
-rw-r--r--Documentation/git-fsck.txt7
-rw-r--r--Documentation/git-log.txt6
-rw-r--r--Documentation/git-merge.txt2
-rw-r--r--Documentation/git-notes.txt25
-rw-r--r--Documentation/git-prune.txt3
-rw-r--r--Documentation/git-pull.txt3
-rw-r--r--Documentation/git-push.txt15
-rw-r--r--Documentation/git-quiltimport.txt11
-rw-r--r--Documentation/git-rebase.txt16
-rw-r--r--Documentation/git-reflog.txt4
-rw-r--r--Documentation/git-request-pull.txt3
-rw-r--r--Documentation/git-rev-list.txt1
-rw-r--r--Documentation/git-rev-parse.txt4
-rw-r--r--Documentation/git-send-email.txt44
-rw-r--r--Documentation/git-send-pack.txt16
-rw-r--r--Documentation/git-svn.txt3
-rw-r--r--Documentation/git-tag.txt6
-rw-r--r--Documentation/git-tools.txt124
-rw-r--r--Documentation/git-update-ref.txt5
-rw-r--r--Documentation/git-verify-commit.txt4
-rw-r--r--Documentation/git-verify-tag.txt4
-rw-r--r--Documentation/git-worktree.txt176
-rw-r--r--Documentation/git.txt31
-rw-r--r--Documentation/gitattributes.txt7
-rw-r--r--Documentation/gitremote-helpers.txt3
-rw-r--r--Documentation/gitrepository-layout.txt22
-rw-r--r--Documentation/gitweb.conf.txt2
-rw-r--r--Documentation/glossary-content.txt21
-rw-r--r--Documentation/i18n.txt33
-rw-r--r--Documentation/merge-config.txt6
-rw-r--r--Documentation/pretty-formats.txt2
-rw-r--r--Documentation/pretty-options.txt7
-rw-r--r--Documentation/rev-list-options.txt7
-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-submodule-config.txt62
-rw-r--r--Documentation/technical/index-format.txt2
-rw-r--r--Documentation/technical/pack-protocol.txt52
-rw-r--r--Documentation/technical/protocol-common.txt5
-rw-r--r--Documentation/technical/racy-git.txt8
-rwxr-xr-xGIT-VERSION-GEN4
-rw-r--r--Makefile71
l---------RelNotes2
-rw-r--r--advice.c8
-rw-r--r--advice.h1
-rw-r--r--alias.c3
-rw-r--r--archive-zip.c99
-rw-r--r--archive.c3
-rw-r--r--argv-array.c6
-rw-r--r--argv-array.h1
-rw-r--r--attr.c4
-rw-r--r--bisect.c136
-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.c3
-rw-r--r--builtin/am.c2411
-rw-r--r--builtin/apply.c5
-rw-r--r--builtin/blame.c31
-rw-r--r--builtin/branch.c29
-rw-r--r--builtin/cat-file.c132
-rw-r--r--builtin/checkout.c273
-rw-r--r--builtin/clean.c30
-rw-r--r--builtin/clone.c143
-rw-r--r--builtin/commit.c55
-rw-r--r--builtin/config.c86
-rw-r--r--builtin/describe.c8
-rw-r--r--builtin/fast-export.c1
-rw-r--r--builtin/fetch.c44
-rw-r--r--builtin/fmt-merge-msg.c1
-rw-r--r--builtin/for-each-ref.c1118
-rw-r--r--builtin/fsck.c116
-rw-r--r--builtin/gc.c36
-rw-r--r--builtin/index-pack.c43
-rw-r--r--builtin/init-db.c3
-rw-r--r--builtin/log.c52
-rw-r--r--builtin/ls-files.c2
-rw-r--r--builtin/merge.c30
-rw-r--r--builtin/notes.c49
-rw-r--r--builtin/pack-objects.c29
-rw-r--r--builtin/prune.c99
-rw-r--r--builtin/pull.c887
-rw-r--r--builtin/push.c42
-rw-r--r--builtin/read-tree.c2
-rw-r--r--builtin/receive-pack.c30
-rw-r--r--builtin/reflog.c35
-rw-r--r--builtin/remote.c40
-rw-r--r--builtin/repack.c24
-rw-r--r--builtin/replace.c6
-rw-r--r--builtin/rerere.c22
-rw-r--r--builtin/reset.c2
-rw-r--r--builtin/rev-list.c6
-rw-r--r--builtin/rev-parse.c57
-rw-r--r--builtin/send-pack.c191
-rw-r--r--builtin/shortlog.c2
-rw-r--r--builtin/show-branch.c9
-rw-r--r--builtin/show-ref.c2
-rw-r--r--builtin/tag.c49
-rw-r--r--