git, branch v2.4.7

Git 2.4.7

2015-07-27T19:25:42Z

Signed-off-by: Junio C Hamano

Merge branch 'jk/pretty-encoding-doc' into maint

2015-07-27T19:21:48Z

Doc update. * jk/pretty-encoding-doc: docs: clarify that --encoding can produce invalid sequences

Merge branch 'tb/checkout-doc' into maint

2015-07-27T19:21:47Z

Doc update. * tb/checkout-doc: git-checkout.txt: document "git checkout " better

Merge branch 'ls/hint-rev-list-count' into maint

2015-07-27T19:21:47Z

* ls/hint-rev-list-count: rev-list: add --count to usage guide

Merge branch 'mm/branch-doc-updates' into maint

2015-07-27T19:21:46Z

* mm/branch-doc-updates: Documentation/branch: document -M and -D in terms of --force Documentation/branch: document -d --force and -m --force

Merge branch 'jc/fsck-retire-require-eoh' into maint

2015-07-27T19:21:46Z

A fix to a minor regression to "git fsck" in v2.2 era that started complaining about a body-less tag object when it lacks a separator empty line after its header to separate it with a non-existent body. * jc/fsck-retire-require-eoh: fsck: it is OK for a tag and a commit to lack the body

Merge branch 'et/http-proxyauth' into maint

2015-07-27T19:21:44Z

We used to ask libCURL to use the most secure authentication method available when talking to an HTTP proxy only when we were told to talk to one via configuration variables. We now ask libCURL to always use the most secure authentication method, because the user can tell libCURL to use an HTTP proxy via an environment variable without using configuration variables. * et/http-proxyauth: http: always use any proxy auth method available

Merge branch 'jc/unexport-git-pager-in-use-in-pager' into maint

2015-07-27T19:21:44Z

When you say "!" while running say "git log", you'd confuse yourself in the resulting shell, that may look as if you took control back to the original shell you spawned "git log" from but that isn't what is happening. To that new shell, we leaked GIT_PAGER_IN_USE environment variable that was meant as a local communication between the original "Git" and subprocesses that was spawned by it after we launched the pager, which caused many "interesting" things to happen, e.g. "git diff | cat" still paints its output in color by default. Stop leaking that environment variable to the pager's half of the fork; we only need it on "Git" side when we spawn the pager. * jc/unexport-git-pager-in-use-in-pager: pager: do not leak "GIT_PAGER_IN_USE" to the pager

Merge branch 'mh/strbuf-read-file-returns-ssize-t' into maint

2015-07-27T19:21:43Z

Avoid possible ssize_t to int truncation. * mh/strbuf-read-file-returns-ssize-t: strbuf: strbuf_read_file() should return ssize_t

Merge branch 'kb/config-unmap-before-renaming' into maint

2015-07-27T19:21:42Z

"git config" failed to update the configuration file when the underlying filesystem is incapable of renaming a file that is still open. * kb/config-unmap-before-renaming: config.c: fix writing config files on Windows network shares