summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore356
-rw-r--r--Documentation/Makefile1
-rw-r--r--Documentation/RelNotes-1.6.6.1.txt37
-rw-r--r--Documentation/RelNotes-1.6.6.txt224
-rw-r--r--Documentation/SubmittingPatches14
-rw-r--r--Documentation/blame-options.txt6
-rw-r--r--Documentation/config.txt127
-rw-r--r--Documentation/diff-options.txt83
-rw-r--r--Documentation/fetch-options.txt18
-rw-r--r--Documentation/git-add.txt2
-rw-r--r--Documentation/git-apply.txt41
-rw-r--r--Documentation/git-bisect-lk2009.txt1358
-rw-r--r--Documentation/git-bisect.txt28
-rw-r--r--Documentation/git-blame.txt2
-rw-r--r--Documentation/git-check-ref-format.txt27
-rw-r--r--Documentation/git-commit.txt9
-rw-r--r--Documentation/git-cvsserver.txt19
-rw-r--r--Documentation/git-describe.txt7
-rw-r--r--Documentation/git-difftool.txt2
-rw-r--r--Documentation/git-fast-import.txt57
-rw-r--r--Documentation/git-fetch.txt14
-rw-r--r--Documentation/git-filter-branch.txt13
-rw-r--r--Documentation/git-format-patch.txt46
-rw-r--r--Documentation/git-fsck.txt5
-rw-r--r--Documentation/git-http-backend.txt178
-rw-r--r--Documentation/git-http-push.txt4
-rw-r--r--Documentation/git-mailinfo.txt7
-rw-r--r--Documentation/git-mergetool.txt2
-rw-r--r--Documentation/git-notes.txt60
-rw-r--r--Documentation/git-push.txt29
-rw-r--r--Documentation/git-read-tree.txt2
-rw-r--r--Documentation/git-rebase.txt25
-rw-r--r--Documentation/git-receive-pack.txt2
-rw-r--r--Documentation/git-remote-helpers.txt85
-rw-r--r--Documentation/git-replace.txt29
-rw-r--r--Documentation/git-reset.txt4
-rw-r--r--Documentation/git-send-email.txt11
-rw-r--r--Documentation/git-send-pack.txt4
-rw-r--r--Documentation/git-show-ref.txt3
-rw-r--r--Documentation/git-stash.txt3
-rw-r--r--Documentation/git-submodule.txt8
-rw-r--r--Documentation/git-svn.txt17
-rw-r--r--Documentation/git-update-index.txt6
-rw-r--r--Documentation/git-var.txt14
-rw-r--r--Documentation/git.txt12
-rw-r--r--Documentation/gitcore-tutorial.txt26
-rw-r--r--Documentation/githooks.txt2
-rw-r--r--Documentation/gitworkflows.txt2
-rw-r--r--Documentation/glossary-content.txt4
-rw-r--r--Documentation/howto/maintain-git.txt2
-rw-r--r--Documentation/howto/revert-branch-rebase.txt4
-rw-r--r--Documentation/howto/update-hook-example.txt2
-rw-r--r--Documentation/merge-config.txt2
-rw-r--r--Documentation/merge-options.txt5
-rw-r--r--Documentation/merge-strategies.txt5
-rw-r--r--Documentation/pretty-formats.txt20
-rw-r--r--Documentation/pretty-options.txt8
-rw-r--r--Documentation/pt_BR/gittutorial.txt22
-rw-r--r--Documentation/pull-fetch-param.txt11
-rw-r--r--Documentation/rev-list-options.txt45
-rw-r--r--Documentation/technical/pack-protocol.txt535
-rw-r--r--Documentation/technical/protocol-capabilities.txt187
-rw-r--r--Documentation/technical/protocol-common.txt96
-rw-r--r--Documentation/user-manual.txt18
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--Makefile84
l---------RelNotes2
-rw-r--r--archive.c29
-rw-r--r--bisect.c8
-rw-r--r--builtin-archive.c34
-rw-r--r--builtin-blame.c1
-rw-r--r--builtin-branch.c3
-rw-r--r--builtin-check-ref-format.c36
-rw-r--r--builtin-checkout.c70
-rw-r--r--builtin-commit-tree.c2
-rw-r--r--builtin-commit.c73
-rw-r--r--builtin-config.c2
-rw-r--r--builtin-describe.c56
-rw-r--r--builtin-diff-tree.c1
-rw-r--r--builtin-fetch-pack.c210
-rw-r--r--builtin-fetch.c328
-rw-r--r--builtin-fsck.c6
-rw-r--r--builtin-grep.c13
-rw-r--r--builtin-log.c39
-rw-r--r--builtin-ls-tree.c100
-rw-r--r--builtin-mailinfo.c49
-rw-r--r--builtin-mailsplit.c2
-rw-r--r--builtin-merge-ours.c6
-rw-r--r--builtin-merge-recursive.c2
-rw-r--r--builtin-merge.c26
-rw-r--r--builtin-mv.c8
-rw-r--r--builtin-pack-objects.c7
-rw-r--r--builtin-push.c2
-rw-r--r--builtin-read-tree.c4
-rw-r--r--builtin-receive-pack.c30
-rw-r--r--builtin-reflog.c3
-rw-r--r--builtin-remote.c130
-rw-r--r--builtin-rerere.c3
-rw-r--r--builtin-rev-list.c16
-rw-r--r--builtin-rev-parse.c21
-rw-r--r--builtin-send-pack.c118
-rw-r--r--builtin-shortlog.c12
-rw-r--r--builtin-show-branch.c4
-rw-r--r--builtin-show-ref.c10
-rw-r--r--builtin-stripspace.c4
-rw-r--r--builtin-tar-tree.c6
-rw-r--r--builtin-update-index.c1
-rw-r--r--builtin-upload-archive.c1
-rw-r--r--builtin.h1
-rw-r--r--bundle.c12
-rw-r--r--cache.h15
-rw-r--r--color.h7
-rw-r--r--combine-diff.c5
-rw-r--r--command-list.txt3
-rw-r--r--commit.c11
-rw-r--r--commit.h25
-rw-r--r--compat/bswap.h12
-rw-r--r--compat/mingw.c196
-rw-r--r--compat/mingw.h36
-rw-r--r--compat/vcbuild/scripts/clink.pl3
-rw-r--r--compat/win32mmap.c12
-rw-r--r--config.c5
-rw-r--r--configure.ac43
-rw-r--r--connect.c22
-rw-r--r--contrib/buildsystems/Generators/Vcproj.pm4
-rw-r--r--contrib/buildsystems/engine.pl3
-rwxr-xr-xcontrib/completion/git-completion.bash142
-rw-r--r--contrib/emacs/git-blame.el156
-rw-r--r--contrib/examples/builtin-fetch--tool.c (renamed from builtin-fetch--tool.c)8
-rwxr-xr-xcontrib/examples/git-merge.sh8