summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-11-17 13:47:36 -0800
committerJunio C Hamano <gitster@pobox.com>2016-11-17 13:47:36 -0800
commit1310affe024fba407bff55dbe65cd6d670c8a32d (patch)
treed279c4dab381caed4ed8256dc66ed32e0c063bb3
parent6d40812e4b5d2128665351f4b427c7da7c7d86d5 (diff)
downloadgit-1310affe024fba407bff55dbe65cd6d670c8a32d.tar.gz
Git 2.11-rc2v2.11.0-rc2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/2.11.0.txt3
-rwxr-xr-xGIT-VERSION-GEN2
2 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/RelNotes/2.11.0.txt b/Documentation/RelNotes/2.11.0.txt
index 7a1fce7720..4898d5ab11 100644
--- 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 feddf2326b..fdd0a2d321 100755
--- 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='
'