Git 2.11-rc2

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

diff --git a/Documentation/RelNotes/2.11.0.txt b/Documentation/RelNotes/2.11.0.txt
index 7a1fce77200230bffe6947302af87da1e587d54b..4898d5ab11869677e7119ec4598969b655af5776 100644 (file)
--- a/Documentation/RelNotes/2.11.0.txt
+++ b/Documentation/RelNotes/2.11.0.txt
@@ -583,3 +583,6 @@ notes for details).
    (merge 28fab7b23d nd/test-helpers later to maint).
    (merge c2bb0c1d1e rs/cocci later to maint).
    (merge 3285b7badb ps/common-info-doc later to maint).
+   (merge 2b090822e8 nd/worktree-lock later to maint).
+   (merge 4bd488ea7c jk/create-branch-remove-unused-param later to maint).
+   (merge 974e0044d6 tk/diffcore-delta-remove-unused later to maint).

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index feddf2326bdfca1184084b94eaa6bc5fe88a53de..fdd0a2d3215aa4b0db5d8c25d97a2fa9bae2844c 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.11.0-rc0
+DEF_VER=v2.11.0-rc2
 
 LF='
 '