Merge branch 'jn/rerere-fail-on-auto-update-failure'

diff --git a/Documentation/RelNotes/2.3.0.txt b/Documentation/RelNotes/2.3.0.txt
index 72ef007a002176708bbbac28692ec4aabfa80dcc..e3c639c8407f99dd1887ba4cef7d1a96a7242516 100644 (file)
--- a/Documentation/RelNotes/2.3.0.txt
+++ b/Documentation/RelNotes/2.3.0.txt
@@ -1,6 +1,12 @@
 Git v2.3 Release Notes
 ======================
 
+This one ended up to be a release with lots of small corrections and
+improvements without big uncomfortably exciting features.  The recent
+security fix that went to 2.2.1 and older maintenance tracks is also
+contained in this update.
+
+
 Updates since v2.2
 ------------------
 
@@ -136,6 +142,11 @@ Unless otherwise noted, all the fixes since v2.2 in the maintenance
 track are contained in this release (see the maintenance releases'
 notes for details).
 
+ * "git http-push" over WebDAV (aka dumb http-push) was broken in
+   v2.2.2 when parsing a symbolic ref, resulting in a bogus request
+   that gets rejected by recent versions of cURL library.
+   (merge f6786c8 jk/http-push-symref-fix later to maint).
+
  * The logic in "git bisect bad HEAD" etc. to avoid forcing the test
    of the common ancestor of bad and good commits was broken.
    (merge 07913d5 cc/bisect-rev-parsing later to maint).