git, branch v2.10.0-rc2

Git 2.10-rc2

2016-08-26T20:59:20Z

Signed-off-by: Junio C Hamano

gitattributes: Document the unified "auto" handling

2016-08-26T20:54:16Z

Update the documentation about text=auto: text=auto now follows the core.autocrlf handling when files are not normalized in the repository. For a cross platform project recommend the usage of attributes for line-ending conversions. Signed-off-by: Torsten Bögershausen Signed-off-by: Junio C Hamano

Prepare for 2.10.0-rc2

2016-08-25T20:56:51Z

Signed-off-by: Junio C Hamano

Merge branch 'ja/i18n'

2016-08-25T20:55:07Z

The recent i18n patch we added during this cycle did a bit too much refactoring of the messages to avoid word-legos; the repetition has been reduced to help translators. * ja/i18n: i18n: simplify numeric error reporting i18n: fix git rebase interactive commit messages i18n: fix typos for translation

Merge branch 'bw/mingw-avoid-inheriting-fd-to-lockfile'

2016-08-25T20:55:07Z

The tempfile (hence its user lockfile) API lets the caller to open a file descriptor to a temporary file, write into it and then finalize it by first closing the filehandle and then either removing or renaming the temporary file. When the process spawns a subprocess after obtaining the file descriptor, and if the subprocess has not exited when the attempt to remove or rename is made, the last step fails on Windows, because the subprocess has the file descriptor still open. Open tempfile with O_CLOEXEC flag to avoid this (on Windows, this is mapped to O_NOINHERIT). * bw/mingw-avoid-inheriting-fd-to-lockfile: mingw: ensure temporary file handles are not inherited by child processes t6026-merge-attr: child processes must not inherit index.lock handles

Merge branch 'dg/document-git-c-in-git-config-doc'

2016-08-25T20:55:07Z

The "git -c var[=val] cmd" facility to append a configuration variable definition at the end of the search order was described in git(1) manual page, but not in git-config(1), which was more likely place for people to look for when they ask "can I make a one-shot override, and if so how?" * dg/document-git-c-in-git-config-doc: doc: mention `git -c` in git-config(1)

Merge branch 'js/no-html-bypass-on-windows'

2016-08-25T20:55:06Z

On Windows, help.browser configuration variable used to be ignored, which has been corrected. * js/no-html-bypass-on-windows: Revert "display HTML in default browser using Windows' shell API"

Merge branch 'hv/doc-commit-reference-style'

2016-08-25T20:55:06Z

A small doc update. * hv/doc-commit-reference-style: SubmittingPatches: document how to reference previous commits

git ls-files: text=auto eol=lf is supported in Git 2.10

2016-08-25T20:38:18Z

The man page for `git ls-files --eol` mentions the combination of text attributes "text=auto eol=lf" or "text=auto eol=crlf" as not supported yet, but may be in the future. Now they are supported. Signed-off-by: Torsten Bögershausen Signed-off-by: Junio C Hamano

i18n: simplify numeric error reporting

2016-08-24T15:47:20Z

Signed-off-by: Jean-Noel Avila Signed-off-by: Junio C Hamano