RelNotes update before -rc2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Jan 10, 2018 at 14:01 UTC
650b1037063d81a9cbcb23cc409eb27f652ae53d
1 file changed
+10
Documentation/RelNotes/2.16.0.txt
+10
@@ -441,6 +441,15 @@ Fixes since v2.15
441
credential helper fail.
442
(merge 4c267f2ae3 jd/fix-strbuf-add-urlencode-bytes later to maint).
443
444
+ * "git rebase -p -X<option>" did not propagate the option properly
445
+ down to underlying merge strategy backend.
446
+ (merge dd6fb0053c js/fix-merge-arg-quoting-in-rebase-p later to maint).
447
+
448
+ * "git merge -s recursive" did not correctly abort when the index is
449
+ dirty, if the merged tree happened to be the same as the current
450
+ HEAD, which has been fixed.
451
+ (merge f309e8e768 ew/empty-merge-with-dirty-index-maint later to maint).
452
+
453
* Other minor doc, test and build updates and code cleanups.
454
(merge 1a1fc2d5b5 rd/man-prune-progress later to maint).
455
(merge 0ba014035a rd/man-reflog-add-n later to maint).
@@ -467,3 +476,4 @@ Fixes since v2.15
476
(merge 3f824e91c8 jk/test-suite-tracing later to maint).
477
(merge 1feb061701 db/doc-config-section-names-with-bs later to maint).
478
(merge 74dea0e13c jh/memihash-opt later to maint).
479
+ (merge 2e9fdc795c ma/bisect-leakfix later to maint).