summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2024-09-17 00:18:58 +0200
committerJunio C Hamano <gitster@pobox.com>2024-09-17 00:19:05 +0200
commite29e5cf288141a51823bbd6d2da90105c42a10c1 (patch)
tree5cad4373c827ecc9ad387237a247072fc7ef67b8
parentMerge branch 'jk/ci-linux32-update' into maint-2.46 (diff)
downloadgit-e29e5cf288141a51823bbd6d2da90105c42a10c1.tar.xz
git-e29e5cf288141a51823bbd6d2da90105c42a10c1.zip
Start preparing for Git 2.46.2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '')
-rw-r--r--Documentation/RelNotes/2.46.2.txt11
-rwxr-xr-xGIT-VERSION-GEN2
l---------RelNotes2
3 files changed, 13 insertions, 2 deletions
diff --git a/Documentation/RelNotes/2.46.2.txt b/Documentation/RelNotes/2.46.2.txt
new file mode 100644
index 0000000000..51471e5400
--- /dev/null
+++ b/Documentation/RelNotes/2.46.2.txt
@@ -0,0 +1,11 @@
+Git 2.46.2 Release Notes
+========================
+
+This release is primarily to merge changes to unbreak the 32-bit
+GitHub actions jobs we use for CI testing, so that we can release
+real fixes for the 2.46.x track after they pass CI.
+
+It also reverts the "git patch-id" change that went into 2.46.1,
+as it seems to have got a regression reported (I haven't verified,
+but it is better to keep a known breakage than adding an unintended
+regression).
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 55850912d1..efe61fd1f8 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v2.46.1
+DEF_VER=v2.46.2-pre
LF='
'
diff --git a/RelNotes b/RelNotes
index 89b65f22b1..0dfe046c88 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.46.1.txt \ No newline at end of file
+Documentation/RelNotes/2.46.2.txt \ No newline at end of file