git, branch v1.8.4-rc0

Git 1.8.4-rc0

2013-07-25T02:29:07Z

Signed-off-by: Junio C Hamano

Merge branch 'mh/multimail'

2013-07-25T02:23:03Z

An enhanced "post-receive" hook to send e-mail messages. * mh/multimail: post-receive-email: deprecate script in favor of git-multimail git-multimail: an improved replacement for post-receive-email

Merge branch 'ob/typofixes'

2013-07-25T02:23:01Z

* ob/typofixes: typofix: in-code comments typofix: documentation typofix: release notes

Merge branch 'es/contacts'

2013-07-25T02:22:58Z

A helper to read from a set of format-patch output files or a range of commits and find those who may have insights to the code that the changes touch by running a series of "git blame" commands. * es/contacts: contrib: contacts: add documentation contrib: contacts: add mailmap support contrib: contacts: interpret committish akin to format-patch contrib: contacts: add ability to parse from committish contrib: add git-contacts helper

Merge branch 'ml/cygwin-updates'

2013-07-25T02:22:49Z

The tip one does _not_ revert c869753e (Force core.filemode to false on Cygwin., 2006-12-30) on purpose, so that people can still retain the old behaviour if they wanted to. * ml/cygwin-updates: cygwin: stop forcing core.filemode=false Cygwin 1.7 supports mmap Cygwin 1.7 has thread-safe pread Cygwin 1.7 needs compat/regex

Merge branch 'rj/sparse'

2013-07-25T02:21:30Z

* rj/sparse: Revert "compat/unsetenv.c: Fix a sparse warning"

Merge branch 'sb/traverse-trees-bitmask-variable-name'

2013-07-25T02:21:25Z

* sb/traverse-trees-bitmask-variable-name: traverse_trees(): clarify return value of the callback

Merge branch 'jk/cat-file-batch-optim'

2013-07-25T02:21:21Z

If somebody wants to only know on-disk footprint of an object without having to know its type or payload size, we can bypass a lot of code to cheaply learn it. * jk/cat-file-batch-optim: Fix some sparse warnings sha1_object_info_extended: pass object_info to helpers sha1_object_info_extended: make type calculation optional packed_object_info: make type lookup optional packed_object_info: hoist delta type resolution to helper sha1_loose_object_info: make type lookup optional sha1_object_info_extended: rename "status" to "type" cat-file: disable object/refname ambiguity check for batch mode

Merge branch 'ml/avoid-using-grep-on-crlf-files'

2013-07-25T02:21:18Z

On systems that understand a CRLF as a line ending, tests in this script that worked on files with CRLF line endings using "grep" to extract matching lines may lose the CR at the end of lines that match, causing the actual output not to match the expected output. * ml/avoid-using-grep-on-crlf-files: test-lib.sh - define and use GREP_STRIPS_CR

Merge branch 'jm/doc-ref-prune'

2013-07-25T02:21:15Z

* jm/doc-ref-prune: Documentation: fix git-prune example usage Documentation: remove --prune from pack-refs examples