The tenth batch
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Apr 15, 2021 at 13:35 UTC
d1b10fc6d84d49796026e567833b88c7f8886c35
1 file changed
+12
Documentation/RelNotes/2.32.0.txt
+12
@@ -63,6 +63,18 @@ UI, Workflows & Features
63
* "gitweb" learned "e-mail privacy" feature to redact strings that
64
look like e-mail addresses on various pages.
65
66
+ * "git apply --3way" has always been "to fall back to 3-way merge
67
+ only when straight application fails". Swap the order of falling
68
+ back so that 3-way is always attempted first (only when the option
69
+ is given, of course) and then straight patch application is used as
70
+ a fallback when it fails.
71
+
72
+ * "git apply" now takes "--3way" and "--cached" at the same time, and
73
+ work and record results only in the index.
74
+
75
+ * The command line completion (in contrib/) has learned that
76
+ CHERRY_PICK_HEAD is a possible pseudo-ref.
77
+
78
79
Performance, Internal Implementation, Development Support etc.
80