diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-09-16 14:22:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-09-16 14:22:55 -0700 |
| commit | 3969d78396e707c5a900dd5e15c365c54bef0283 (patch) | |
| tree | 30bdc6bfbb608b4d5236278e2a6d387dee34e8d5 | |
| parent | Merge branch 'jk/ref-filter-trailer-fixes' (diff) | |
| download | git-3969d78396e707c5a900dd5e15c365c54bef0283.tar.gz git-3969d78396e707c5a900dd5e15c365c54bef0283.zip | |
The seventeenth batch
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/RelNotes/2.47.0.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/RelNotes/2.47.0.txt b/Documentation/RelNotes/2.47.0.txt index ffc0c5c4a2..86d2596bcc 100644 --- a/Documentation/RelNotes/2.47.0.txt +++ b/Documentation/RelNotes/2.47.0.txt @@ -65,6 +65,9 @@ UI, Workflows & Features to discourage its use by interactive users. Add documentation to help tool writers. + * "git apply --3way" learned to take "--ours" and other options. + + Performance, Internal Implementation, Development Support etc. -------------------------------------------------------------- @@ -241,3 +244,4 @@ Fixes since v2.46 * Other code cleanup, docfix, build fix, etc. (merge be10ac7037 jc/mailinfo-header-cleanup later to maint). (merge 9a36ea37ae jc/doc-skip-fetch-all-and-prefetch later to maint). + (merge 4460e052e0 jc/range-diff-lazy-setup later to maint). |