Git 2.26.1

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

diff --cc Documentation/RelNotes/2.26.1.txt
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..1b4ecb3fdc5473bbeb68efa69b6c8de2596e1cb8
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/Documentation/RelNotes/2.26.1.txt
@@@ -1,0 -1,0 +1,5 @@@
++Git v2.26.1 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 5db483f972ccd3d1c981cd2820a47fc8be6b4e94,26fbde3f210b71d655078318a8ef0a2cb1210ab4..a65cf74d93835f88c28e4ea5116aec03a3e7fb5c
--- 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.26.0
 -DEF_VER=v2.25.3
++DEF_VER=v2.26.1
  
  LF='
  '

diff --cc RelNotes
index 370269d8dfc14c9dda695f8bdbc84febe64771a3,96469c66f863b3b6b3f8f5717d4874c94baabb09..9ccd8cad4355bfa4f2bf29ef6a3b107829116811
--- 1/RelNotes
--- 2/RelNotes
+++ b/RelNotes
@@@ -1,1 -1,1 +1,1 @@@
- Documentation/RelNotes/2.26.0.txt
 -Documentation/RelNotes/2.25.3.txt
++Documentation/RelNotes/2.26.1.txt

diff --cc credential.c
Simple merge

diff --cc credential.h
Simple merge

diff --cc t/t0300-credentials.sh
Simple merge