diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-04-15 13:35:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-04-15 13:36:01 -0700 |
| commit | d1b10fc6d84d49796026e567833b88c7f8886c35 (patch) | |
| tree | a250e037b7a2ca9ce8b6d2d6e581f172da480c9f /Documentation/RelNotes | |
| parent | Merge branch 'jz/apply-3way-cached' (diff) | |
| download | tgif-d1b10fc6d84d49796026e567833b88c7f8886c35.tar.xz | |
The tenth batch
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/RelNotes')
| -rw-r--r-- | Documentation/RelNotes/2.32.0.txt | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/Documentation/RelNotes/2.32.0.txt b/Documentation/RelNotes/2.32.0.txt index 8670b73436..ea220f2a51 100644 --- a/Documentation/RelNotes/2.32.0.txt +++ b/Documentation/RelNotes/2.32.0.txt @@ -63,6 +63,18 @@ UI, Workflows & Features * "gitweb" learned "e-mail privacy" feature to redact strings that look like e-mail addresses on various pages. + * "git apply --3way" has always been "to fall back to 3-way merge + only when straight application fails". Swap the order of falling + back so that 3-way is always attempted first (only when the option + is given, of course) and then straight patch application is used as + a fallback when it fails. + + * "git apply" now takes "--3way" and "--cached" at the same time, and + work and record results only in the index. + + * The command line completion (in contrib/) has learned that + CHERRY_PICK_HEAD is a possible pseudo-ref. + Performance, Internal Implementation, Development Support etc. |