summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore357
-rw-r--r--Documentation/Makefile8
-rw-r--r--Documentation/RelNotes-1.6.5.1.txt20
-rw-r--r--Documentation/RelNotes-1.6.5.2.txt19
-rw-r--r--Documentation/RelNotes-1.6.5.3.txt63
-rw-r--r--Documentation/RelNotes-1.6.6.txt108
-rw-r--r--Documentation/config.txt21
-rw-r--r--Documentation/diff-options.txt68
-rw-r--r--Documentation/fetch-options.txt48
-rw-r--r--Documentation/git-add.txt8
-rw-r--r--Documentation/git-bisect.txt23
-rw-r--r--Documentation/git-check-ref-format.txt32
-rw-r--r--Documentation/git-clone.txt26
-rw-r--r--Documentation/git-commit.txt2
-rw-r--r--Documentation/git-describe.txt24
-rw-r--r--Documentation/git-difftool.txt2
-rw-r--r--Documentation/git-fetch.txt29
-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-gc.txt2
-rw-r--r--Documentation/git-http-push.txt4
-rw-r--r--Documentation/git-ls-files.txt6
-rw-r--r--Documentation/git-merge.txt33
-rw-r--r--Documentation/git-mergetool.txt2
-rw-r--r--Documentation/git-pull.txt56
-rw-r--r--Documentation/git-push.txt19
-rw-r--r--Documentation/git-read-tree.txt2
-rw-r--r--Documentation/git-rebase.txt9
-rw-r--r--Documentation/git-receive-pack.txt2
-rw-r--r--Documentation/git-replace.txt21
-rw-r--r--Documentation/git-reset.txt4
-rw-r--r--Documentation/git-send-email.txt4
-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.txt11
-rw-r--r--Documentation/gitattributes.txt10
-rw-r--r--Documentation/gitcore-tutorial.txt24
-rw-r--r--Documentation/githooks.txt2
-rw-r--r--Documentation/gitworkflows.txt115
-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/manpage-quote-apos.xsl16
-rw-r--r--Documentation/merge-config.txt2
-rw-r--r--Documentation/merge-options.txt91
-rw-r--r--Documentation/pretty-formats.txt9
-rw-r--r--Documentation/pt_BR/gittutorial.txt22
-rw-r--r--Documentation/pull-fetch-param.txt4
-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.txt14
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--Makefile70
l---------RelNotes2
-rw-r--r--archive.c4
-rw-r--r--builtin-apply.c61
-rw-r--r--builtin-blame.c6
-rw-r--r--builtin-branch.c3
-rw-r--r--builtin-check-ref-format.c40
-rw-r--r--builtin-checkout.c68
-rw-r--r--builtin-clone.c13
-rw-r--r--builtin-commit-tree.c2
-rw-r--r--builtin-commit.c51
-rw-r--r--builtin-describe.c56
-rw-r--r--builtin-fetch.c128
-rw-r--r--builtin-fsck.c2
-rw-r--r--builtin-gc.c11
-rw-r--r--builtin-grep.c9
-rw-r--r--builtin-help.c7
-rw-r--r--builtin-log.c33
-rw-r--r--builtin-ls-files.c8
-rw-r--r--builtin-ls-remote.c6
-rw-r--r--builtin-ls-tree.c100
-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.c27
-rw-r--r--builtin-mv.c8
-rw-r--r--builtin-pack-objects.c7
-rw-r--r--builtin-push.c9
-rw-r--r--builtin-read-tree.c4
-rw-r--r--builtin-receive-pack.c24
-rw-r--r--builtin-reflog.c3
-rw-r--r--builtin-remote.c2
-rw-r--r--builtin-rerere.c3
-rw-r--r--builtin-rev-list.c9
-rw-r--r--builtin-rev-parse.c21
-rw-r--r--builtin-send-pack.c2
-rw-r--r--builtin-shortlog.c9
-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-upload-archive.c14
-rw-r--r--builtin.h1
-rw-r--r--cache.h7
-rw-r--r--commit.c4
-rw-r--r--commit.h22
-rw-r--r--compat/bswap.h10
-rw-r--r--compat/mingw.c12
-rw-r--r--compat/mingw.h23
-rw-r--r--compat/vcbuild/scripts/clink.pl3
-rw-r--r--compat/win32mmap.c12
-rw-r--r--configure.ac43
-rw-r--r--contrib/buildsystems/Generators/Vcproj.pm4
-rw-r--r--contrib/buildsystems/engine.pl3
-rwxr-xr-xcontrib/completion/git-completion.bash26
-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
-rwxr-xr-xcontrib/examples/git-resolve.sh2
-rwxr-xr-xcontrib/fast-import/git-p45
-rwxr-xr-xcontrib/fast-import/import-tars.perl5
-rwxr-xr-xcontrib/hooks/post-receive-email6
-rw-r--r--diff-no-index.c4
-rw-r--r--diff.c443
-rw-r--r--diff.h3
-rw-r--r--editor.c32
-rw-r--r--fast-import.c3
-rwxr-xr-xgit-add--interactive.perl21
-rwxr-xr-xgit-am.sh5
-rwxr-xr-xgit-bisect.sh8
-rw-r--r--