diff options
Diffstat (limited to 'Documentation/RelNotes/2.16.0.txt')
| -rw-r--r-- | Documentation/RelNotes/2.16.0.txt | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/Documentation/RelNotes/2.16.0.txt b/Documentation/RelNotes/2.16.0.txt index c648c128e..919f3eb3e 100644 --- a/Documentation/RelNotes/2.16.0.txt +++ b/Documentation/RelNotes/2.16.0.txt @@ -341,7 +341,7 @@ Fixes since v2.15 * Command line completion (in contrib/) has been taught about the "--copy" option of "git branch". - * When "git rebase" prepared an mailbox of changes and fed it to "git + * When "git rebase" prepared a mailbox of changes and fed it to "git am" to replay them, it was confused when a stray "From " happened to be in the log message of one of the replayed changes. This has been corrected. @@ -441,6 +441,15 @@ Fixes since v2.15 credential helper fail. (merge 4c267f2ae3 jd/fix-strbuf-add-urlencode-bytes later to maint). + * "git rebase -p -X<option>" did not propagate the option properly + down to underlying merge strategy backend. + (merge dd6fb0053c js/fix-merge-arg-quoting-in-rebase-p later to maint). + + * "git merge -s recursive" did not correctly abort when the index is + dirty, if the merged tree happened to be the same as the current + HEAD, which has been fixed. + (merge f309e8e768 ew/empty-merge-with-dirty-index-maint later to maint). + * Other minor doc, test and build updates and code cleanups. (merge 1a1fc2d5b5 rd/man-prune-progress later to maint). (merge 0ba014035a rd/man-reflog-add-n later to maint). @@ -467,3 +476,4 @@ Fixes since v2.15 (merge 3f824e91c8 jk/test-suite-tracing later to maint). (merge 1feb061701 db/doc-config-section-names-with-bs later to maint). (merge 74dea0e13c jh/memihash-opt later to maint). + (merge 2e9fdc795c ma/bisect-leakfix later to maint). |