Git 2.38-rc0

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

diff --git a/Documentation/RelNotes/2.38.0.txt b/Documentation/RelNotes/2.38.0.txt
index fe04b31b6ee686d4171743bf08d3ae28b16eebd5..01617baa98d5a3dc5849a6f92926d678902047a2 100644 (file)
--- a/Documentation/RelNotes/2.38.0.txt
+++ b/Documentation/RelNotes/2.38.0.txt
@@ -378,6 +378,15 @@ Fixes since v2.37
    clones, leaked the instances, which has been plugged.
    (merge 66eede4a37 jk/plug-list-object-filter-leaks later to maint).
 
+ * Fix another UI regression in the reimplemented "add -p".
+   (merge f6f0ee247f rs/add-p-worktree-mode-prompt-fix later to maint).
+
+ * "git fetch" over protocol v2 sent an incorrect ref prefix request
+   to the server and made "git pull" with configured fetch refspec
+   that does not cover the remote branch to merge with fail, which has
+   been corrected.
+   (merge 49ca2fba39 jk/proto-v2-ref-prefix-fix later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
    (merge 77b9e85c0f vd/fix-perf-tests later to maint).
    (merge 0682bc43f5 jk/test-crontab-fixes later to maint).

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 6ec9e34282bde3771d203a0a5208a68418d720d7..ecd94fd3f28130d8b5a4c1bd09f33e82d5b29cb0 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.37.GIT
+DEF_VER=v2.38.0-rc0
 
 LF='
 '