git, branch v2.4.6

Git 2.4.6

2015-07-15T19:31:07Z

Signed-off-by: Junio C Hamano

Merge branch 'mm/describe-doc' into maint

2015-07-15T18:41:26Z

Docfix. * mm/describe-doc: Documentation/describe: improve one-line summary

Merge branch 'jc/prompt-document-ps1-state-separator' into maint

2015-07-15T18:41:26Z

Docfix. * jc/prompt-document-ps1-state-separator: git-prompt.sh: document GIT_PS1_STATESEPARATOR

Merge branch 'es/osx-header-pollutes-mask-macro' into maint

2015-07-15T18:41:24Z

* es/osx-header-pollutes-mask-macro: ewah: use less generic macro name ewah/bitmap: silence warning about MASK macro redefinition

Merge branch 'es/utf8-stupid-compiler-workaround' into maint

2015-07-15T18:41:23Z

A compilation workaround. * es/utf8-stupid-compiler-workaround: utf8: NO_ICONV: silence uninitialized variable warning

Merge branch 'fk/doc-format-patch-vn' into maint

2015-07-15T18:41:22Z

Docfix. * fk/doc-format-patch-vn: doc: format-patch: fix typo

Merge branch 'pt/t0302-needs-sanity' into maint

2015-07-15T18:41:21Z

* pt/t0302-needs-sanity: t0302: "unreadable" test needs SANITY prereq

Merge branch 'me/fetch-into-shallow-safety' into maint

2015-07-15T18:41:20Z

"git fetch --depth=" and "git clone --depth=" issued a shallow transfer request even to an upload-pack that does not support the capability. * me/fetch-into-shallow-safety: fetch-pack: check for shallow if depth given

Merge branch 'mh/fsck-reflog-entries' into maint

2015-07-15T18:41:19Z

"git fsck" used to ignore missing or invalid objects recorded in reflog. * mh/fsck-reflog-entries: fsck: report errors if reflog entries point at invalid objects fsck_handle_reflog_sha1(): new function

Merge branch 'af/tcsh-completion-noclobber' into maint

2015-07-15T18:41:18Z

The tcsh completion writes a bash scriptlet but that would have failed for users with noclobber set. * af/tcsh-completion-noclobber: git-completion.tcsh: fix redirect with noclobber