summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore2
-rw-r--r--Documentation/CodingGuidelines9
-rw-r--r--Documentation/Makefile22
-rw-r--r--Documentation/RelNotes-1.5.2.2.txt2
-rw-r--r--Documentation/RelNotes-1.6.0.2.txt2
-rw-r--r--Documentation/RelNotes-1.6.1.1.txt4
-rw-r--r--Documentation/RelNotes-1.6.1.2.txt4
-rw-r--r--Documentation/RelNotes-1.6.2.1.txt19
-rw-r--r--Documentation/RelNotes-1.6.2.2.txt35
-rw-r--r--Documentation/RelNotes-1.6.2.txt164
-rw-r--r--Documentation/SubmittingPatches27
-rw-r--r--Documentation/blame-options.txt6
-rwxr-xr-xDocumentation/cat-texi.perl8
-rw-r--r--Documentation/config.txt39
-rw-r--r--Documentation/diff-options.txt32
-rw-r--r--Documentation/git-add.txt7
-rw-r--r--Documentation/git-am.txt62
-rw-r--r--Documentation/git-annotate.txt6
-rw-r--r--Documentation/git-apply.txt30
-rw-r--r--Documentation/git-archive.txt17
-rw-r--r--Documentation/git-blame.txt6
-rw-r--r--Documentation/git-bundle.txt132
-rw-r--r--Documentation/git-checkout.txt4
-rw-r--r--Documentation/git-cherry.txt3
-rw-r--r--Documentation/git-config.txt4
-rw-r--r--Documentation/git-cvsimport.txt2
-rw-r--r--Documentation/git-describe.txt2
-rw-r--r--Documentation/git-filter-branch.txt60
-rw-r--r--Documentation/git-format-patch.txt1
-rw-r--r--Documentation/git-gc.txt10
-rw-r--r--Documentation/git-imap-send.txt14
-rw-r--r--Documentation/git-ls-files.txt2
-rw-r--r--Documentation/git-ls-tree.txt2
-rw-r--r--Documentation/git-mergetool.txt15
-rw-r--r--Documentation/git-push.txt36
-rw-r--r--Documentation/git-rebase.txt24
-rw-r--r--Documentation/git-reset.txt29
-rw-r--r--Documentation/git-rev-parse.txt3
-rw-r--r--Documentation/git-send-email.txt27
-rw-r--r--Documentation/git-shortlog.txt49
-rw-r--r--Documentation/git-show-branch.txt4
-rw-r--r--Documentation/git-submodule.txt7
-rw-r--r--Documentation/git-svn.txt36
-rw-r--r--Documentation/git-tag.txt5
-rw-r--r--Documentation/git.txt10
-rw-r--r--Documentation/gitattributes.txt34
-rw-r--r--Documentation/gitcore-tutorial.txt8
-rw-r--r--Documentation/githooks.txt2
-rw-r--r--Documentation/gitk.txt5
-rw-r--r--Documentation/gittutorial-2.txt4
-rw-r--r--Documentation/gittutorial.txt4
-rw-r--r--Documentation/howto/rebase-from-internal-branch.txt2
-rw-r--r--Documentation/howto/revert-a-faulty-merge.txt4
-rw-r--r--Documentation/howto/setup-git-server-over-http.txt2
-rw-r--r--Documentation/mailmap.txt75
-rw-r--r--Documentation/pretty-formats.txt7
-rw-r--r--Documentation/pretty-options.txt2
-rw-r--r--Documentation/rev-list-options.txt8
-rw-r--r--Documentation/technical/api-run-command.txt15
-rw-r--r--Documentation/technical/api-strbuf.txt13
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--INSTALL3
-rw-r--r--Makefile122
-rw-r--r--README14
l---------RelNotes2
-rw-r--r--archive.c2
-rw-r--r--branch.c19
-rw-r--r--builtin-add.c2
-rw-r--r--builtin-apply.c266
-rw-r--r--builtin-blame.c52
-rw-r--r--builtin-branch.c71
-rw-r--r--builtin-cat-file.c2
-rw-r--r--builtin-checkout.c43
-rw-r--r--builtin-clone.c68
-rw-r--r--builtin-commit.c53
-rw-r--r--builtin-count-objects.c5
-rw-r--r--builtin-fetch--tool.c5
-rw-r--r--builtin-fetch.c13
-rw-r--r--builtin-fsck.c48
-rw-r--r--builtin-gc.c49
-rw-r--r--builtin-help.c4
-rw-r--r--builtin-init-db.c2
-rw-r--r--builtin-log.c41
-rw-r--r--builtin-ls-files.c62
-rw-r--r--builtin-ls-tree.c9
-rw-r--r--builtin-mailinfo.c21
-rw-r--r--builtin-merge-recursive.c2
-rw-r--r--builtin-merge.c50
-rw-r--r--builtin-pack-objects.c9
-rw-r--r--builtin-prune.c14
-rw-r--r--builtin-push.c7
-rw-r--r--builtin-receive-pack.c142
-rw-r--r--builtin-remote.c6
-rw-r--r--builtin-rerere.c11
-rw-r--r--builtin-reset.c26
-rw-r--r--builtin-revert.c13
-rw-r--r--builtin-shortlog.c44
-rw-r--r--builtin-symbolic-ref.c3
-rw-r--r--builtin-tag.c29
-rw-r--r--builtin-update-index.c2
-rw-r--r--builtin-verify-pack.c2
-rw-r--r--bundle.c32
-rw-r--r--cache.h14
-rw-r--r--color.c59
-rw-r--r--color.h4
-rw-r--r--commit.c15
-rw-r--r--commit.h1
-rw-r--r--compat/memmem.c5
-rw-r--r--compat/mingw.h12
-rw-r--r--config.c12
-rw-r--r--config.mak.in5
-rw-r--r--configure.ac24
-rw-r--r--connect.c2
-rwxr-xr-xcontrib/completion/git-completion.bash221
-rwxr-xr-xcontrib/difftool/git-difftool73
-rwxr-xr-xcontrib/difftool/git-difftool-helper240
-rw-r--r--contrib/difftool/git-difftool.txt105
-rw-r--r--contrib/emacs/Makefile2
-rw-r--r--contrib/emacs/README39
-rw-r--r--contrib/emacs/git.el207
-rw-r--r--contrib/emacs/vc-git.el216
-rwxr-xr-xcontrib/examples/git-svnimport.perl36
-rw-r--r--contrib/examples/git-svnimport.txt6
-rwxr-xr-xcontrib/fast-import/git-p411
-rwxr-xr-xcontrib/git-resurrect.sh180
-rw-r--r--contrib/hooks/post-receive-email4
-rw-r--r--contrib/vim/README12
-rw-r--r--ctype.c33
-rw-r--r--daemon.c4
-rw-r--r--date.c27
-rw-r--r--diff-lib.c55