summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore6
-rw-r--r--.mailmap1
-rw-r--r--Documentation/RelNotes-1.5.4.txt154
-rwxr-xr-xDocumentation/cmd-list.perl25
-rw-r--r--Documentation/config.txt61
-rw-r--r--Documentation/core-tutorial.txt41
-rw-r--r--Documentation/diff-options.txt24
-rw-r--r--Documentation/git-add.txt4
-rw-r--r--Documentation/git-bisect.txt29
-rw-r--r--Documentation/git-branch.txt2
-rw-r--r--Documentation/git-cherry-pick.txt20
-rw-r--r--Documentation/git-clone.txt3
-rw-r--r--Documentation/git-cvsexportcommit.txt22
-rw-r--r--Documentation/git-diff.txt3
-rw-r--r--Documentation/git-for-each-ref.txt5
-rw-r--r--Documentation/git-format-patch.txt14
-rw-r--r--Documentation/git-gc.txt24
-rw-r--r--Documentation/git-http-push.txt5
-rw-r--r--Documentation/git-index-pack.txt2
-rw-r--r--Documentation/git-instaweb.txt2
-rw-r--r--Documentation/git-local-fetch.txt66
-rw-r--r--Documentation/git-lost-found.txt4
-rw-r--r--Documentation/git-ls-files.txt5
-rw-r--r--Documentation/git-merge-index.txt2
-rw-r--r--Documentation/git-merge.txt4
-rw-r--r--Documentation/git-mergetool.txt8
-rw-r--r--Documentation/git-mv.txt2
-rw-r--r--Documentation/git-pack-objects.txt8
-rw-r--r--Documentation/git-peek-remote.txt3
-rw-r--r--Documentation/git-push.txt17
-rw-r--r--Documentation/git-rebase.txt34
-rw-r--r--Documentation/git-remote.txt12
-rw-r--r--Documentation/git-reset.txt7
-rw-r--r--Documentation/git-rev-list.txt25
-rw-r--r--Documentation/git-rev-parse.txt76
-rw-r--r--Documentation/git-revert.txt9
-rw-r--r--Documentation/git-rm.txt4
-rw-r--r--Documentation/git-send-email.txt46
-rw-r--r--Documentation/git-send-pack.txt5
-rw-r--r--Documentation/git-ssh-fetch.txt52
-rw-r--r--Documentation/git-ssh-upload.txt48
-rw-r--r--Documentation/git-stash.txt2
-rw-r--r--Documentation/git-submodule.txt3
-rw-r--r--Documentation/git-svn.txt8
-rw-r--r--Documentation/git-symbolic-ref.txt2
-rw-r--r--Documentation/git-tag.txt23
-rw-r--r--Documentation/git-tools.txt5
-rw-r--r--Documentation/git.txt13
-rw-r--r--Documentation/gitattributes.txt17
-rw-r--r--Documentation/glossary.txt12
-rw-r--r--Documentation/hooks.txt27
-rw-r--r--Documentation/howto/maintain-git.txt277
-rw-r--r--Documentation/howto/recover-corrupted-blob-object.txt134
-rw-r--r--Documentation/merge-options.txt17
-rw-r--r--Documentation/urls.txt6
-rw-r--r--Documentation/user-manual.txt81
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--Makefile144
l---------RelNotes2
-rw-r--r--archive-tar.c74
-rw-r--r--archive-zip.c11
-rw-r--r--archive.h3
-rw-r--r--attr.c7
-rw-r--r--builtin-add.c100
-rw-r--r--builtin-apply.c490
-rw-r--r--builtin-archive.c92
-rw-r--r--builtin-blame.c56
-rw-r--r--builtin-branch.c160
-rw-r--r--builtin-bundle.c372
-rw-r--r--builtin-check-attr.c2
-rw-r--r--builtin-checkout-index.c37
-rw-r--r--builtin-clean.c153
-rw-r--r--builtin-commit-tree.c58
-rw-r--r--builtin-config.c4
-rw-r--r--builtin-count-objects.c32
-rw-r--r--builtin-describe.c70
-rw-r--r--builtin-diff-files.c4
-rw-r--r--builtin-diff-index.c4
-rw-r--r--builtin-diff-tree.c7
-rw-r--r--builtin-diff.c12
-rw-r--r--builtin-fetch--tool.c73
-rw-r--r--builtin-fetch-pack.c (renamed from fetch-pack.c)282
-rw-r--r--builtin-fetch.c671
-rw-r--r--builtin-fmt-merge-msg.c19
-rw-r--r--builtin-for-each-ref.c218
-rw-r--r--builtin-fsck.c80
-rw-r--r--builtin-gc.c177
-rw-r--r--builtin-http-fetch.c77
-rw-r--r--builtin-init-db.c16
-rw-r--r--builtin-log.c190
-rw-r--r--builtin-ls-files.c38
-rw-r--r--builtin-ls-remote.c74
-rw-r--r--builtin-ls-tree.c6
-rw-r--r--builtin-mailinfo.c8
-rw-r--r--builtin-mailsplit.c6
-rw-r--r--builtin-merge-ours.c28
-rw-r--r--builtin-mv.c96
-rw-r--r--builtin-name-rev.c64
-rw-r--r--builtin-pack-objects.c469
-rw-r--r--builtin-pack-refs.c41
-rw-r--r--builtin-prune-packed.c14
-rw-r--r--builtin-push.c180
-rw-r--r--builtin-rerere.c97
-rw-r--r--builtin-reset.c290
-rw-r--r--builtin-rev-list.c270
-rw-r--r--builtin-rev-parse.c128
-rw-r--r--builtin-revert.c118
-rw-r--r--builtin-rm.c56
-rw-r--r--builtin-send-pack.c652
-rw-r--r--builtin-shortlog.c11
-rw-r--r--builtin-show-branch.c13
-rw-r--r--builtin-stripspace.c70
-rw-r--r--builtin-symbolic-ref.c52
-rw-r--r--builtin-tag.c144
-rw-r--r--builtin-unpack-objects.c10
-rw-r--r--builtin-update-index.c71
-rw-r--r--builtin-update-ref.c72
-rw-r--r--builtin-verify-tag.c2
-rw-r--r--builtin.h10
-rw-r--r--bundle.c351
-rw-r--r--bundle.h25
-rw-r--r--cache-tree.c60
-rw-r--r--cache-tree.h2
-rw-r--r--cache.h36
-rw-r--r--color.c18
-rw-r--r--color.h4
-rw-r--r--combine-diff.c26
-rw-r--r--commit.c1019
-rw-r--r--commit.h39
-rw-r--r--compat/memmem.c29
-rw-r--r--compat/mkdtemp.c8
-rw-r--r--conf