From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 11 Apr 2022 23:44:45 +0000 (-0700)
Subject: Merge tag 'v2.35.2'
X-Git-Tag: v2.36.0-rc2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f1b50ec6f85883c483b344442c69cd3d88b38380;p=thirdparty%2Fgit.git

Merge tag 'v2.35.2'
---

f1b50ec6f85883c483b344442c69cd3d88b38380
diff --cc Documentation/config.txt
index 43f5e6fd6d,8d3f518083..e284b042f2
--- a/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[]