Git 2.42-rc0

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

diff --git a/Documentation/RelNotes/2.42.0.txt b/Documentation/RelNotes/2.42.0.txt
index 340f55b230f0bc02e7da130caa5a02f1c238b2b6..0d31aed9f9d0e9c8583a68ce7a17d6cca5a54d71 100644 (file)
--- a/Documentation/RelNotes/2.42.0.txt
+++ b/Documentation/RelNotes/2.42.0.txt
@@ -30,6 +30,14 @@ UI, Workflows & Features
    is a valid and sensible thing to update a branch at a remote
    repository, rather than reconciling with merge/rebase.
 
+ * "git blame --contents=file" has been taught to work in a bare
+   repository.
+
+ * "git branch -f X" to repoint the branch X said that X was "checked
+   out" in another worktree, even when branch X was not and instead
+   being bisected or rebased.  The message was reworded to say the
+   branch was "in use".
+
 
 Performance, Internal Implementation, Development Support etc.
 
@@ -73,6 +81,17 @@ Performance, Internal Implementation, Development Support etc.
  * "git branch --list --format=<format>" and friends are taught
    a new "%(describe)" placeholder.
 
+ * Clarify how to choose the starting point for a new topic in
+   developer guidance document.
+
+ * The implementation of "get_sha1_hex()" that reads a hexadecimal
+   string that spells a full object name has been extended to cope
+   with any hash function used in the repository, but the "sha1" in
+   its name survived.  Rename it to get_hash_hex(), a name that is
+   more consistent within its friends like get_hash_hex_algop().
+
+ * Command line parser fix, and a small parse-options API update.
+
 
 Fixes since v2.41
 -----------------
@@ -229,6 +248,10 @@ Fixes since v2.41
    such a malformed todo file.
    (merge 9645a087c2 ah/sequencer-rewrite-todo-fix later to maint).
 
+ * Rewrite the description of giving a custom command to the
+   submodule.<name>.update configuration variable.
+   (merge 7cebc5bd78 pv/doc-submodule-update-settings later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
    (merge 51f9d2e563 sa/doc-ls-remote later to maint).
    (merge c6d26a9dda jk/format-patch-message-id-unleak later to maint).

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 07e72c28b8d82316c25a534da4380aaf8672ed3f..7313f8aa3ec8c4f6982d33c42a723524835c4742 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.41.GIT
+DEF_VER=v2.42.0-rc0
 
 LF='
 '