Git 2.11-rc3

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 4898d5ab11869677e7119ec4598969b655af5776..cea2a502deb96601ba0b71a831c5c05537d07160 100644 (file)
--- a/Documentation/RelNotes/2.11.0.txt
+++ b/Documentation/RelNotes/2.11.0.txt
@@ -574,6 +574,15 @@ notes for details).
  * Portability update and workaround for builds on recent Mac OS X.
    (merge a296bc0132 ls/macos-update later to maint).
 
  * Portability update and workaround for builds on recent Mac OS X.
    (merge a296bc0132 ls/macos-update later to maint).
 

+ * Using a %(HEAD) placeholder in "for-each-ref --format=" option
+   caused the command to segfault when on an unborn branch.
+   (merge 84679d470d jc/for-each-ref-head-segfault-fix later to maint).
+
+ * "git rebase -i" did not work well with core.commentchar
+   configuration variable for two reasons, both of which have been
+   fixed.
+   (merge 882cd23777 js/rebase-i-commentchar-fix later to maint).
+

  * Other minor doc, test and build updates and code cleanups.
    (merge 5c238e29a8 jk/common-main later to maint).
    (merge 5a5749e45b ak/pre-receive-hook-template-modefix later to maint).
  * Other minor doc, test and build updates and code cleanups.
    (merge 5c238e29a8 jk/common-main later to maint).
    (merge 5a5749e45b ak/pre-receive-hook-template-modefix later to maint).

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index fdd0a2d3215aa4b0db5d8c25d97a2fa9bae2844c..092bd838b51ee1963d9350c885e464cb4b2fcce3 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE

-DEF_VER=v2.11.0-rc2
+DEF_VER=v2.11.0-rc3

 
 LF='
 '
 
 LF='
 '