git, branch v2.8.2

Git 2.8.2

2016-04-29T21:19:11Z

Signed-off-by: Junio C Hamano

Merge branch 'js/mingw-tests-2.8' into maint

2016-04-29T21:16:01Z

Code clean-up. * js/mingw-tests-2.8: Windows: shorten code by re-using convert_slashes()

Merge branch 'ep/trace-doc-sample-fix' into maint

2016-04-29T21:16:00Z

Fix a typo in an example in the trace API documentation. * ep/trace-doc-sample-fix: api-trace.txt: fix typo

Merge branch 'jc/makefile-redirection-stderr' into maint

2016-04-29T21:15:59Z

A minor fix in the Makefile. * jc/makefile-redirection-stderr: Makefile: fix misdirected redirections

Merge branch 'ak/use-hashmap-iter-first-in-submodule-config' into maint

2016-04-29T21:15:58Z

Minor code cleanup. * ak/use-hashmap-iter-first-in-submodule-config: submodule-config: use hashmap_iter_first()

Merge branch 'tb/blame-force-read-cache-to-workaround-safe-crlf' into maint

2016-04-29T21:15:58Z

When running "git blame $path" with unnormalized data in the index for the path, the data in the working tree was blamed, even though "git add" would not have changed what is already in the index, due to "safe crlf" that disables the line-end conversion. It has been corrected. * tb/blame-force-read-cache-to-workaround-safe-crlf: correct blame for files commited with CRLF

Merge branch 'sk/send-pack-all-fix' into maint

2016-04-29T21:15:57Z

"git send-pack --all " was broken when its command line option parsing was written in the 2.6 timeframe. * sk/send-pack-all-fix: git-send-pack: fix --all option when used with directory

Merge branch 'sg/diff-multiple-identical-renames' into maint

2016-04-29T21:15:55Z

"git diff -M" used to work better when two originally identical files A and B got renamed to X/A and X/B by pairing A to X/A and B to X/B, but this was broken in the 2.0 timeframe. * sg/diff-multiple-identical-renames: diffcore: fix iteration order of identical files during rename detection

Merge branch 'ss/msvc' into maint

2016-04-29T21:15:54Z

Build updates for MSVC. * ss/msvc: MSVC: use shipped headers instead of fallback definitions MSVC: vsnprintf in Visual Studio 2015 doesn't need SNPRINTF_SIZE_CORR any more

Merge tag 'l10n-2.8.0-rnd3-fr' of git://github.com/git-l10n/git-po into maint

2016-04-25T20:36:26Z

l10n-2.8.0-rnd3-fr * tag 'l10n-2.8.0-rnd3-fr' of git://github.com/git-l10n/git-po: l10n: fr: don't translate "merge" as a parameter l10n: fr: change "id de clé" to match "id-clé" l10n: fr: fix wrongly translated option name l10n: fr: fix transcation of "dir"