summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Documentation/RelNotes-1.6.3.2.txt61
-rw-r--r--Documentation/RelNotes-1.6.4.txt36
-rw-r--r--Documentation/config.txt8
-rw-r--r--Documentation/git-apply.txt2
-rw-r--r--Documentation/git-cat-file.txt4
-rw-r--r--Documentation/git-check-ref-format.txt2
-rw-r--r--Documentation/git-cvsexportcommit.txt4
-rw-r--r--Documentation/git-difftool.txt2
-rw-r--r--Documentation/git-mergetool.txt2
-rw-r--r--Documentation/git-mktree.txt19
-rw-r--r--Documentation/git-parse-remote.txt20
-rw-r--r--Documentation/git-rebase.txt3
-rw-r--r--Documentation/git-repack.txt7
-rw-r--r--Documentation/git-rerere.txt65
-rw-r--r--Documentation/git-rev-parse.txt35
-rw-r--r--Documentation/git-send-email.txt49
-rw-r--r--Documentation/git-show-branch.txt12
-rw-r--r--Documentation/git-stash.txt34
-rw-r--r--Documentation/git-submodule.txt26
-rw-r--r--Documentation/git-svn.txt8
-rw-r--r--Documentation/git.txt12
-rw-r--r--Documentation/gitmodules.txt9
-rw-r--r--Documentation/gittutorial.txt4
-rw-r--r--Documentation/merge-config.txt2
-rw-r--r--Documentation/merge-options.txt3
-rw-r--r--Documentation/technical/api-parse-options.txt21
-rw-r--r--Documentation/technical/api-remote.txt4
-rw-r--r--Documentation/urls-remotes.txt3
-rw-r--r--Documentation/user-manual.txt4
-rw-r--r--Makefile109
-rw-r--r--alias.c8
-rw-r--r--archive.c2
-rw-r--r--attr.c3
-rw-r--r--base85.c2
-rw-r--r--bisect.c547
-rw-r--r--bisect.h13
-rw-r--r--builtin-add.c6
-rw-r--r--builtin-apply.c37
-rw-r--r--builtin-archive.c3
-rw-r--r--builtin-bisect--helper.c17
-rw-r--r--builtin-blame.c28
-rw-r--r--builtin-branch.c3
-rw-r--r--builtin-cat-file.c6
-rw-r--r--builtin-check-attr.c4
-rw-r--r--builtin-checkout-index.c2
-rw-r--r--builtin-checkout.c6
-rw-r--r--builtin-clean.c3
-rw-r--r--builtin-clone.c2
-rw-r--r--builtin-commit.c9
-rw-r--r--builtin-config.c3
-rw-r--r--builtin-count-objects.c2
-rw-r--r--builtin-describe.c2
-rw-r--r--builtin-fast-export.c2
-rw-r--r--builtin-fetch-pack.c4
-rw-r--r--builtin-fetch.c15
-rw-r--r--builtin-fmt-merge-msg.c5
-rw-r--r--builtin-for-each-ref.c35
-rw-r--r--builtin-fsck.c2
-rw-r--r--builtin-gc.c3
-rw-r--r--builtin-grep.c418
-rw-r--r--builtin-help.c18
-rw-r--r--builtin-log.c268
-rw-r--r--builtin-ls-files.c4
-rw-r--r--builtin-mailinfo.c10
-rw-r--r--builtin-merge-base.c2
-rw-r--r--builtin-merge-file.c2
-rw-r--r--builtin-merge-recursive.c5
-rw-r--r--builtin-merge.c9
-rw-r--r--builtin-mktree.c190
-rw-r--r--builtin-mv.c3
-rw-r--r--builtin-name-rev.c2
-rw-r--r--builtin-pack-objects.c3
-rw-r--r--builtin-pack-refs.c2
-rw-r--r--builtin-prune.c2
-rw-r--r--builtin-push.c19
-rw-r--r--builtin-receive-pack.c10
-rw-r--r--builtin-remote.c75
-rw-r--r--builtin-reset.c2
-rw-r--r--builtin-rev-list.c67
-rw-r--r--builtin-rev-parse.c19
-rw-r--r--builtin-revert.c6
-rw-r--r--builtin-rm.c3
-rw-r--r--builtin-send-pack.c13
-rw-r--r--builtin-shortlog.c2
-rw-r--r--builtin-show-branch.c124
-rw-r--r--builtin-symbolic-ref.c3
-rw-r--r--builtin-tag.c9
-rw-r--r--builtin-unpack-objects.c4
-rw-r--r--builtin-update-ref.c3
-rw-r--r--builtin-upload-archive.c12
-rw-r--r--builtin.h1
-rw-r--r--bundle.c2
-rw-r--r--cache.h2
-rw-r--r--compat/basename.c15
-rw-r--r--compat/mingw.c79
-rw-r--r--compat/mingw.h33
-rw-r--r--compat/mkstemps.c70
-rw-r--r--compat/nedmalloc/License.txt23
-rw-r--r--compat/nedmalloc/Readme.txt136
-rw-r--r--compat/nedmalloc/malloc.c.h5752
-rw-r--r--compat/nedmalloc/nedmalloc.c966
-rw-r--r--compat/nedmalloc/nedmalloc.h180
-rw-r--r--compat/snprintf.c4
-rw-r--r--compat/winansi.c3
-rw-r--r--config.mak.in3
-rw-r--r--configure.ac30
-rw-r--r--connect.c13
-rwxr-xr-xcontrib/completion/git-completion.bash52
-rwxr-xr-xcontrib/fast-import/import-tars.perl17
-rwxr-xr-x[-rw-r--r--]contrib/hooks/post-receive-email4
-rw-r--r--daemon.c10
-rw-r--r--delta.h5
-rw-r--r--diff-lib.c2
-rw-r--r--diff.c24
-rw-r--r--dir.c2
-rwxr-xr-xgit-add--interactive.perl95
-rwxr-xr-xgit-am.sh6
-rwxr-xr-xgit-bisect.sh180
-rw-r--r--git-compat-util.h31
-rwxr-xr-xgit-cvsexportcommit.perl74
-rw-r--r--git-mergetool--lib.sh31
-rwxr-xr-xgit-parse-remote.sh223
-rwxr-xr-xgit-pull.sh13
-rwxr-xr-xgit-rebase--interactive.sh2
-rwxr-xr-xgit-rebase.sh9
-rwxr-xr-xgit-send-email.perl42
-rwxr-xr-xgit-sh-setup.sh28
-rwxr-xr-xgit-stash.sh4
-rwxr-xr-xgit-submodule.sh73
-rwxr-xr-xgit-svn.perl58
-rwxr-xr-xgit-web--browse.sh5
-rw-r--r--git.c1
-rw-r--r--