From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 25 Mar 2020 20:07:47 +0000 (-0700)
Subject: Git 2.26.1
X-Git-Tag: v2.26.1^0
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=de49261b050d9cd8ec73842356077bc5b606640f;p=thirdparty%2Fgit.git

Git 2.26.1

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

de49261b050d9cd8ec73842356077bc5b606640f
diff --cc Documentation/RelNotes/2.26.1.txt
index 0000000000,0000000000..1b4ecb3fdc
new file mode 100644
--- /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 5db483f972,26fbde3f21..a65cf74d93
--- a/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 370269d8df,96469c66f8..9ccd8cad43
--- a/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