Skip to content

Commit 650b103

Browse files
committed
RelNotes update before -rc2
Signed-off-by: Junio C Hamano <[email protected]>
1 parent fac9106 commit 650b103

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

Documentation/RelNotes/2.16.0.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -441,6 +441,15 @@ Fixes since v2.15
441441
credential helper fail.
442442
(merge 4c267f2ae3 jd/fix-strbuf-add-urlencode-bytes later to maint).
443443

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+
444453
* Other minor doc, test and build updates and code cleanups.
445454
(merge 1a1fc2d5b5 rd/man-prune-progress later to maint).
446455
(merge 0ba014035a rd/man-reflog-add-n later to maint).
@@ -467,3 +476,4 @@ Fixes since v2.15
467476
(merge 3f824e91c8 jk/test-suite-tracing later to maint).
468477
(merge 1feb061701 db/doc-config-section-names-with-bs later to maint).
469478
(merge 74dea0e13c jh/memihash-opt later to maint).
479+
(merge 2e9fdc795c ma/bisect-leakfix later to maint).

0 commit comments

Comments
 (0)