Git 2.20.3

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

diff --cc Documentation/RelNotes/2.20.3.txt
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..f6eccd103b69666f9c5f0a6814c8e7eaffcc2350
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/Documentation/RelNotes/2.20.3.txt
@@@ -1,0 -1,0 +1,5 @@@
++Git v2.20.3 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 492f3480f0e06b288b0315dfbfff156d40d78031,6f302a1d0996d94627c0641d047850c8c9770882..1482b4d75f4d838a30b436f99ed9ba253ccaf229
--- 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.20.2
 -DEF_VER=v2.19.4
++DEF_VER=v2.20.3
  
  LF='
  '

diff --cc RelNotes
index b6fe6c7f6a0a7c8f848b01f001d489995e864b38,d13adb91576366c504ab5a164500530efe336035..d02c89a9809f1673179741a53736874bff3a6713
--- 1/RelNotes
--- 2/RelNotes
+++ b/RelNotes
@@@ -1,1 -1,1 +1,1 @@@
- Documentation/RelNotes/2.20.2.txt
 -Documentation/RelNotes/2.19.4.txt
++Documentation/RelNotes/2.20.3.txt

diff --cc fsck.c
Simple merge