summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--.mailmap4
-rw-r--r--Documentation/CodingGuidelines16
-rw-r--r--Documentation/Makefile3
-rw-r--r--Documentation/RelNotes/1.7.11.2.txt2
-rw-r--r--Documentation/RelNotes/1.8.5.txt382
-rw-r--r--Documentation/SubmittingPatches15
-rw-r--r--Documentation/blame-options.txt10
-rw-r--r--Documentation/config.txt142
-rw-r--r--Documentation/diff-config.txt6
-rw-r--r--Documentation/everyday.txt2
-rw-r--r--Documentation/git-blame.txt10
-rw-r--r--Documentation/git-cat-file.txt16
-rw-r--r--Documentation/git-check-attr.txt9
-rw-r--r--Documentation/git-check-ignore.txt7
-rw-r--r--Documentation/git-check-ref-format.txt2
-rw-r--r--Documentation/git-checkout.txt14
-rw-r--r--Documentation/git-cherry.txt3
-rw-r--r--Documentation/git-config.txt29
-rw-r--r--Documentation/git-credential.txt2
-rw-r--r--Documentation/git-describe.txt14
-rw-r--r--Documentation/git-diff.txt13
-rw-r--r--Documentation/git-fast-import.txt30
-rw-r--r--Documentation/git-fetch-pack.txt4
-rw-r--r--Documentation/git-format-patch.txt4
-rw-r--r--Documentation/git-gc.txt6
-rw-r--r--Documentation/git-grep.txt9
-rw-r--r--Documentation/git-log.txt5
-rw-r--r--Documentation/git-merge-file.txt5
-rw-r--r--Documentation/git-merge-tree.txt2
-rw-r--r--Documentation/git-mv.txt10
-rw-r--r--Documentation/git-name-rev.txt2
-rw-r--r--Documentation/git-pull.txt18
-rw-r--r--Documentation/git-push.txt79
-rw-r--r--Documentation/git-rebase.txt4
-rw-r--r--Documentation/git-remote.txt6
-rw-r--r--Documentation/git-replace.txt29
-rw-r--r--Documentation/git-rev-parse.txt104
-rw-r--r--Documentation/git-revert.txt2
-rw-r--r--Documentation/git-rm.txt8
-rw-r--r--Documentation/git-sh-setup.txt8
-rw-r--r--Documentation/git-status.txt8
-rw-r--r--Documentation/git-svn.txt90
-rw-r--r--Documentation/git-update-ref.txt54
-rw-r--r--Documentation/git-whatchanged.txt40
-rw-r--r--Documentation/git.txt59
-rw-r--r--Documentation/gitcli.txt6
-rw-r--r--Documentation/gitcore-tutorial.txt39
-rw-r--r--Documentation/gitcvs-migration.txt2
-rw-r--r--Documentation/gitmodules.txt3
-rw-r--r--Documentation/gitremote-helpers.txt21
-rw-r--r--Documentation/glossary-content.txt99
-rw-r--r--Documentation/howto/revert-a-faulty-merge.txt8
-rw-r--r--Documentation/howto/revert-branch-rebase.txt2
-rw-r--r--Documentation/howto/setup-git-server-over-http.txt4
-rw-r--r--Documentation/line-range-format.txt16
-rw-r--r--Documentation/revisions.txt18
-rw-r--r--Documentation/technical/api-diff.txt10
-rw-r--r--Documentation/technical/api-setup.txt38
-rw-r--r--Documentation/technical/http-protocol.txt503
-rw-r--r--Documentation/technical/pack-heuristics.txt6
-rw-r--r--Documentation/user-manual.txt146
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--Makefile27
l---------RelNotes2
-rw-r--r--archive.c18
-rw-r--r--archive.h4
-rw-r--r--branch.c4
-rw-r--r--builtin.h1
-rw-r--r--builtin/add.c170
-rw-r--r--builtin/apply.c24
-rw-r--r--builtin/bisect--helper.c8
-rw-r--r--builtin/blame.c115
-rw-r--r--builtin/branch.c49
-rw-r--r--builtin/cat-file.c49
-rw-r--r--builtin/check-attr.c26
-rw-r--r--builtin/check-ignore.c61
-rw-r--r--builtin/checkout-index.c8
-rw-r--r--builtin/checkout.c60
-rw-r--r--builtin/clean.c30
-rw-r--r--builtin/clone.c67
-rw-r--r--builtin/commit.c122
-rw-r--r--builtin/config.c153
-rw-r--r--builtin/describe.c24
-rw-r--r--builtin/diff-files.c2
-rw-r--r--builtin/diff-index.c2
-rw-r--r--builtin/diff.c6
-rw-r--r--builtin/fast-export.c97
-rw-r--r--builtin/fetch-pack.c11
-rw-r--r--builtin/fetch.c62
-rw-r--r--builtin/for-each-ref.c13
-rw-r--r--builtin/fsck.c33
-rw-r--r--builtin/gc.c71
-rw-r--r--builtin/grep.c61
-rw-r--r--builtin/hash-object.c8
-rw-r--r--builtin/index-pack.c1
-rw-r--r--builtin/log.c45
-rw-r--r--builtin/ls-files.c99
-rw-r--r--builtin/ls-tree.c19
-rw-r--r--builtin/merge-base.c10
-rw-r--r--builtin/merge-file.c2
-rw-r--r--builtin/merge.c14
-rw-r--r--builtin/mv.c141
-rw-r--r--builtin/name-rev.c14
-rw-r--r--builtin/notes.c12
-rw-r--r--builtin/pack-objects.c25
-rw-r--r--builtin/push.c24
-rw-r--r--builtin/receive-pack.c12
-rw-r--r--builtin/reflog.c5
-rw-r--r--builtin/remote.c32
-rw-r--r--builtin/repack.c388
-rw-r--r--builtin/replace.c18
-rw-r--r--builtin/rerere.c8
-rw-r--r--builtin/reset.c58
-rw-r--r--builtin/rev-parse.c32
-rw-r--r--builtin/revert.c64
-rw-r--r--builtin/rm.c70
-rw-r--r--builtin/send-pack.c26
-rw-r--r--builtin/shortlog.c18
-rw-r--r--builtin/show-branch.c28
-rw-r--r--builtin/show-ref.c15
-rw-r--r--builtin/stripspace.c8
-rw-r--r--builtin/tag.c33
-rw-r--r--builtin/tar-tree.c11
-rw-r--r--builtin/update-index.c6
-rw-r--r--builtin/update-ref.c256
-rw-r--r--cache.h123
-rw-r--r--combine-diff.c4
-rw-r--r--commit.h2
-rw-r--r--compat/apple-common-crypto.h86
-rw-r--r--compat/mingw.c7