Git 2.23.2

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --cc Documentation/RelNotes/2.23.2.txt
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..b697cbe0e31a0bf3f61fabb0c9b7b7483f1f0b35
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/Documentation/RelNotes/2.23.2.txt
@@@ -1,0 -1,0 +1,5 @@@
++Git v2.23.2 Release Notes
++=========================
++
++This release merges the security fix that appears in v2.17.4; see
++the release notes for that version for details.

diff --cc GIT-VERSION-GEN
index 2e7264ee5b2b18fbeeb1b8a03e93ed7cc02b907b,e3c9d78890dc219f6e830e6604fbbc10d2b8bc75..70721f0c1193a87c809806d1f2742a2e068d99c0
--- 1/GIT-VERSION-GEN
--- 2/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@@ -1,7 -1,7 +1,7 @@@
  #!/bin/sh
  
  GVF=GIT-VERSION-FILE
- DEF_VER=v2.23.1
 -DEF_VER=v2.22.3
++DEF_VER=v2.23.2
  
  LF='
  '

diff --cc RelNotes
index f63d8a47a67ff4d5f61c17e81b7677e9af111457,6c1853bf38552d8e19d541d05941643f9f92a426..895970ffd8a9fb123c46f66914072e26d2fae564
--- 1/RelNotes
--- 2/RelNotes
+++ b/RelNotes
@@@ -1,1 -1,1 +1,1 @@@
- Documentation/RelNotes/2.23.1.txt
 -Documentation/RelNotes/2.22.3.txt
++Documentation/RelNotes/2.23.2.txt

diff --cc fsck.c
Simple merge