aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-06-17 10:33:42 -0700
committerJunio C Hamano <gitster@pobox.com>2022-06-17 10:33:42 -0700
commitb81b98f818fdacdc472f2afed2ae67d9d0893fe2 (patch)
treee2d2909f8b8f7c772dc9ba88b3c7b27377762c16
parentMerge branch 'jk/bug-fl-va-list-fix' (diff)
downloadgit-b81b98f818fdacdc472f2afed2ae67d9d0893fe2.tar.gz
git-b81b98f818fdacdc472f2afed2ae67d9d0893fe2.zip
Another batch of fixes before -rc1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/2.37.0.txt5
-rwxr-xr-xGIT-VERSION-GEN2
2 files changed, 5 insertions, 2 deletions
diff --git a/Documentation/RelNotes/2.37.0.txt b/Documentation/RelNotes/2.37.0.txt
index bf00ccc437..f1b93f3c59 100644
--- a/Documentation/RelNotes/2.37.0.txt
+++ b/Documentation/RelNotes/2.37.0.txt
@@ -54,7 +54,7 @@ UI, Workflows & Features
* Update the doctype written in gitweb output to xhtml5.
- * The "transfer.credentialsInUrl" configuration variable controls what
+ * The "transfer.credentialsInURL" configuration variable controls what
happens when a URL with embedded login credential is used on either
"fetch" or "push". Credentials are currently only detected in
`remote.<name>.url` config, not `remote.<name>.pushurl`.
@@ -309,6 +309,9 @@ Fixes since v2.36
* Use-after-free (with another forget-to-free) fix.
(merge 323822c72b ab/remote-free-fix later to maint).
+ * Remove a coccinelle rule that is no longer relevant.
+ (merge b1299de4a1 jc/cocci-cleanup later to maint).
+
* Other code cleanup, docfix, build fix, etc.
(merge e6b2582da3 cm/reftable-0-length-memset later to maint).
(merge 0b75e5bf22 ab/misc-cleanup later to maint).
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 1d667699e1..c0b5e722dd 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v2.36.GIT
+DEF_VER=v2.37.0-rc1 ;# not quite
LF='
'