Sixth batch for 2.14

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Junio C Hamano committed Jun 4, 2017 at 09:58 UTC f164c1bf6533ee0205c545e850f733269839f62f
1 file changed +23
Documentation/RelNotes/2.14.0.txt
+23
@@ -113,6 +113,11 @@ Performance, Internal Implementation, Development Support etc.
113 * The internal implementation of "git grep" has seen some clean-up.
114 (merge 8df4c2953f ab/grep-preparatory-cleanup later to maint).
115
116 + * Update the C style recommendation for notes for translators, as
117 + recent versions of gettext tools can work with our style of
118 + multi-line comments.
119 + (merge 66f5f6dca9 ab/c-translators-comment-style later to maint).
120 +
121
122 Also contains various documentation updates and code clean-ups.
123
@@ -283,6 +288,19 @@ notes for details).
288 use the $path in the output and use it to look up .gitattributes.
289 (merge 30d005c020 jk/diff-blob later to maint).
290
291 + * The "collision detecting" SHA-1 implementation shipped with 2.13
292 + was quite broken on some big-endian platforms and/or platforms that
293 + do not like unaligned fetches. Update to the upstream code which
294 + has already fixed these issues.
295 + (merge a0103914c2 ab/sha1dc-maint later to maint).
296 +
297 + * "git am -h" triggered a BUG().
298 + (merge f3a2fffe06 jk/unbreak-am-h later to maint).
299 +
300 + * The interaction of "url.*.insteadOf" and custom URL scheme's
301 + whitelisting is now documented better.
302 + (merge 2c9a2ae285 jk/url-insteadof-config later to maint).
303 +
304 * Other minor doc, test and build updates and code cleanups.
305 (merge 515360f9e9 jn/credential-doc-on-clear later to maint).
306 (merge 0e6d899fee ab/aix-needs-compat-regex later to maint).
@@ -296,3 +314,8 @@ notes for details).
314 (merge b275da816c ah/doc-interpret-trailers-ifexists later to maint).
315 (merge fc7a5edb55 ah/doc-pretty-format-fix later to maint).
316 (merge 7e95fcb4b5 sb/t5531-update-desc later to maint).
317 + (merge b8f354f294 sd/t3200-typofix later to maint).
318 + (merge ba746ff9c9 ah/doc-filter-branch-export-env later to maint).
319 + (merge 44e2ff09ce ab/t3070-test-dedup later to maint).
320 + (merge 9ee4aa95db rf/completion-config-commit later to maint).
321 + (merge fb87327aee ah/doc-rev-parse-short-default later to maint).