Git 2.18.3

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

diff --cc Documentation/RelNotes/2.18.3.txt
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..25143f0cec5804d86e2ea6bf0950369e119afef2
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/Documentation/RelNotes/2.18.3.txt
@@@ -1,0 -1,0 +1,5 @@@
++Git v2.18.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 5ae6419eb41644f8427cfb0870a47cf825012198,cdb21b3311e73cdbd3d83000fdc369f3b24b4748..fd9e5b87b2652b58ce61a232a8459c84911d895e
--- 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.18.2
 -DEF_VER=v2.17.4
++DEF_VER=v2.18.3
  
  LF='
  '

diff --cc RelNotes
index 1b5f706c0ffe28042da045814654d26658dc4736,196ab8077e14d09ce66529ee8b2c0372f5650798..1811ee10b3e152ebc7a71474cf8021dde6b660fb
--- 1/RelNotes
--- 2/RelNotes
+++ b/RelNotes
@@@ -1,1 -1,1 +1,1 @@@
- Documentation/RelNotes/2.18.2.txt
 -Documentation/RelNotes/2.17.4.txt
++Documentation/RelNotes/2.18.3.txt

diff --cc credential.c
Simple merge

diff --cc fsck.c
Simple merge