File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff 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).
You can’t perform that action at this time.
0 commit comments