mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-09-28 06:30:37 +02:00
Code

Sync with master

Browse Source
This commit is contained in:
Junio C Hamano 2021-04-15 13:38:18 -07:00
commit 2be84b2ade
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Documentation/RelNotes/2.32.0.txt
View File

@ -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.