summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Documentation/RelNotes/2.47.0.txt7
-rwxr-xr-xGIT-VERSION-GEN2
2 files changed, 8 insertions, 1 deletions
diff --git a/Documentation/RelNotes/2.47.0.txt b/Documentation/RelNotes/2.47.0.txt
index 41ba7cfd91..6100871ec5 100644
--- a/Documentation/RelNotes/2.47.0.txt
+++ b/Documentation/RelNotes/2.47.0.txt
@@ -156,6 +156,9 @@ Performance, Internal Implementation, Development Support etc.
* The reftable backend learned to more efficiently handle exclude
patterns while enumerating the refs.
+ * CI updates. FreeBSD image has been updated to 13.4.
+ (merge 2eeb29702e cb/ci-freebsd-13-4 later to maint).
+
Fixes since v2.46
-----------------
@@ -286,6 +289,10 @@ Fixes since v2.46
* A few usability fixes to "git jump" (in contrib/).
(merge 083b82544d jk/jump-quickfix-fixes later to maint).
+ * "git diff --exit-code" ignored modified binary files, which has
+ been corrected.
+ (merge 9a41735af6 rs/diff-exit-code-binary later to maint).
+
* Other code cleanup, docfix, build fix, etc.
(merge be10ac7037 jc/mailinfo-header-cleanup later to maint).
(merge 4460e052e0 jc/range-diff-lazy-setup later to maint).
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index ee71e9d8aa..38e920725c 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v2.46.GIT
+DEF_VER=v2.47.0-rc0
LF='
'