Git 2.26-rc2

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

diff --git a/Documentation/RelNotes/2.26.0.txt b/Documentation/RelNotes/2.26.0.txt
index 80d5e15aa0402950b51a3ed47e5cbeb30289669f..98b2ed8e652e0159f60761ca54d8db037cec5b2c 100644 (file)
--- a/Documentation/RelNotes/2.26.0.txt
+++ b/Documentation/RelNotes/2.26.0.txt
@@ -12,10 +12,9 @@ Backward compatibility notes
 
    If your workflow is negatively affected by this change, please
    report it to git@vger.kernel.org so that we can take a look into
-   it.  In the meantime, the 'rebase.backend' configuration variable
-   can be set in order to use the old default behaviour (the value to
-   do so is not described here---it is given to those who report their
-   issues to the list ;-).
+   it.  After doing so, you can set the 'rebase.backend' configuration
+   variable to 'apply', in order to use the old default behaviour in
+   the meantime.
 
 
 UI, Workflows & Features

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 41c2d7c8852fc1b0f34dac3093cf79b32953d110..a7a0fc96678e8bcfef6ffdad961415dd146f73a6 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.26.0-rc1
+DEF_VER=v2.26.0-rc2
 
 LF='
 '