Sixth batch for 2.14

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

diff --git a/Documentation/RelNotes/2.14.0.txt b/Documentation/RelNotes/2.14.0.txt
index 7ee326e1dc04246f03af523caa108ed7a682e715..1bb29b6e9d90f36f20a357909c627a2041d824c2 100644 (file)
--- a/Documentation/RelNotes/2.14.0.txt
+++ b/Documentation/RelNotes/2.14.0.txt
@@ -113,6 +113,11 @@ Performance, Internal Implementation, Development Support etc.
  * The internal implementation of "git grep" has seen some clean-up.
    (merge 8df4c2953f ab/grep-preparatory-cleanup later to maint).
 
+ * Update the C style recommendation for notes for translators, as
+   recent versions of gettext tools can work with our style of
+   multi-line comments.
+   (merge 66f5f6dca9 ab/c-translators-comment-style later to maint).
+
 
 Also contains various documentation updates and code clean-ups.
 
@@ -283,6 +288,19 @@ notes for details).
    use the $path in the output and use it to look up .gitattributes.
    (merge 30d005c020 jk/diff-blob later to maint).
 
+ * The "collision detecting" SHA-1 implementation shipped with 2.13
+   was quite broken on some big-endian platforms and/or platforms that
+   do not like unaligned fetches.  Update to the upstream code which
+   has already fixed these issues.
+   (merge a0103914c2 ab/sha1dc-maint later to maint).
+
+ * "git am -h" triggered a BUG().
+   (merge f3a2fffe06 jk/unbreak-am-h later to maint).
+
+ * The interaction of "url.*.insteadOf" and custom URL scheme's
+   whitelisting is now documented better.
+   (merge 2c9a2ae285 jk/url-insteadof-config later to maint).
+
  * Other minor doc, test and build updates and code cleanups.
    (merge 515360f9e9 jn/credential-doc-on-clear later to maint).
    (merge 0e6d899fee ab/aix-needs-compat-regex later to maint).
@@ -296,3 +314,8 @@ notes for details).
    (merge b275da816c ah/doc-interpret-trailers-ifexists later to maint).
    (merge fc7a5edb55 ah/doc-pretty-format-fix later to maint).
    (merge 7e95fcb4b5 sb/t5531-update-desc later to maint).
+   (merge b8f354f294 sd/t3200-typofix later to maint).
+   (merge ba746ff9c9 ah/doc-filter-branch-export-env later to maint).
+   (merge 44e2ff09ce ab/t3070-test-dedup later to maint).
+   (merge 9ee4aa95db rf/completion-config-commit later to maint).
+   (merge fb87327aee ah/doc-rev-parse-short-default later to maint).