Merge tag 'v2.35.2'

diff --cc Documentation/config.txt
index 43f5e6fd6d3fae020f585a74d02ece43e51e17c9,8d3f5180831cf23de109bb012f035f3b4df54b33..e284b042f227f1eda81a434c022d8d33debe9cb7
--- 1/Documentation/config.txt
--- 2/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -495,6 -460,10 +495,8 @@@ include::config/repack.txt[
  
  include::config/rerere.txt[]
  
 -include::config/reset.txt[]
 -
+ include::config/safe.txt[]
+ 
  include::config/sendemail.txt[]
  
  include::config/sequencer.txt[]

diff --cc compat/mingw.c
Simple merge

diff --cc compat/mingw.h
Simple merge

diff --cc git-compat-util.h
Simple merge

diff --cc setup.c
Simple merge