Git 2.16-rc1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Jan 5, 2018 at 13:45 UTC
36438dc19dd2a305dddebd44bf7a65f1a220075b
2 files changed
+12
-1
Documentation/RelNotes/2.16.0.txt
+11
@@ -433,6 +433,14 @@ Fixes since v2.15
433
from strings read from various "state" files.
434
(merge 041fe8fc83 ra/prompt-eread-fix later to maint).
435
436
+ * "git merge -s recursive" did not correctly abort when the index is
437
+ dirty, if the merged tree happened to be the same as the current
438
+ HEAD, which has been fixed.
439
+
440
+ * Bytes with high-bit set were encoded incorrectly and made
441
+ credential helper fail.
442
+ (merge 4c267f2ae3 jd/fix-strbuf-add-urlencode-bytes later to maint).
443
+
444
* Other minor doc, test and build updates and code cleanups.
445
(merge 1a1fc2d5b5 rd/man-prune-progress later to maint).
446
(merge 0ba014035a rd/man-reflog-add-n later to maint).
@@ -456,3 +464,6 @@ Fixes since v2.15
464
(merge c07b3adff1 bw/path-doc later to maint).
465
(merge bf9d7df950 tz/lib-git-svn-svnserve-tests later to maint).
466
(merge dec366c9a8 sr/http-sslverify-config-doc later to maint).
467
+ (merge 3f824e91c8 jk/test-suite-tracing later to maint).
468
+ (merge 1feb061701 db/doc-config-section-names-with-bs later to maint).
469
+ (merge 74dea0e13c jh/memihash-opt later to maint).
GIT-VERSION-GEN
+1
-1
@@ -1,7 +1,7 @@
1
#!/bin/sh
2
3
GVF=GIT-VERSION-FILE
4
-DEF_VER=v2.16.0-rc0
4
+DEF_VER=v2.16.0-rc1
5
6
LF='
7
'