summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2019-12-04 23:01:50 +0100
committerLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2019-12-06 16:31:15 +0100
commit367f12b7e92aef4e8a41fe601d90984a2b7a0381 (patch)
tree159d2c1a75aef38315f472ed21ace813a66eb8ec
parentMerge branch 'fix-msys2-quoting-bugs' (diff)
downloadtgif-367f12b7e92aef4e8a41fe601d90984a2b7a0381.tar.xz
Git 2.21.1
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
-rw-r--r--Documentation/RelNotes/2.21.1.txt12
-rwxr-xr-xGIT-VERSION-GEN2
l---------RelNotes2
3 files changed, 14 insertions, 2 deletions
diff --git a/Documentation/RelNotes/2.21.1.txt b/Documentation/RelNotes/2.21.1.txt
new file mode 100644
index 0000000000..b7594151e4
--- /dev/null
+++ b/Documentation/RelNotes/2.21.1.txt
@@ -0,0 +1,12 @@
+Git v2.21.1 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.14.6, v2.15.4,
+v2.17.3 and in v2.20.2, addressing the security issues CVE-2019-1348,
+CVE-2019-1349, CVE-2019-1350, CVE-2019-1351, CVE-2019-1352,
+CVE-2019-1353, CVE-2019-1354, CVE-2019-1387, and CVE-2019-19604;
+see the release notes for those versions for details.
+
+Additionally, this version also includes a couple of fixes for the
+Windows-specific quoting of command-line arguments when Git executes
+a Unix shell on Windows.
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 13f835f9cd..7e5ba89679 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v2.21.0
+DEF_VER=v2.21.1
LF='
'
diff --git a/RelNotes b/RelNotes
index 31e21359a8..0466feb916 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.21.0.txt \ No newline at end of file
+Documentation/RelNotes/2.21.1.txt \ No newline at end of file