Git 2.21.2

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

diff --cc Documentation/RelNotes/2.21.2.txt
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..a0fb83bb534104b0b87811c129e293a7130ab576
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/Documentation/RelNotes/2.21.2.txt
@@@ -1,0 -1,0 +1,5 @@@
++Git v2.21.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 7e5ba896793dd92de491245b0c8db851e7c9f2df,1482b4d75f4d838a30b436f99ed9ba253ccaf229..9fa5ebbceaa42e740d5579b878d7a26fafc60bba
--- 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.21.1
 -DEF_VER=v2.20.3
++DEF_VER=v2.21.2
  
  LF='
  '

diff --cc RelNotes
index 0466feb91690c5846d35c062ba4d9b1d26680f7d,d02c89a9809f1673179741a53736874bff3a6713..ce5750f0473e7a4efd17aea5df25f9182afa10e0
--- 1/RelNotes
--- 2/RelNotes
+++ b/RelNotes
@@@ -1,1 -1,1 +1,1 @@@
- Documentation/RelNotes/2.21.1.txt
 -Documentation/RelNotes/2.20.3.txt
++Documentation/RelNotes/2.21.2.txt

diff --cc fsck.c
Simple merge