diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-11-23 11:24:59 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-11-23 11:24:59 -0800 |
| commit | e2b2d6a172b76d44cb7b1ddb12ea5bfac9613a44 (patch) | |
| tree | 9aadeefa9542275ffca2a44259a3088b2aca1428 | |
| parent | Merge branch 'jc/setup-cleanup-fix' (diff) | |
| download | tgif-e2b2d6a172b76d44cb7b1ddb12ea5bfac9613a44.tar.xz | |
Git 2.11-rc3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/RelNotes/2.11.0.txt | 9 | ||||
| -rwxr-xr-x | GIT-VERSION-GEN | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/Documentation/RelNotes/2.11.0.txt b/Documentation/RelNotes/2.11.0.txt index 4898d5ab11..cea2a502de 100644 --- 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). + * 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). diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index fdd0a2d321..092bd838b5 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v2.11.0-rc2 +DEF_VER=v2.11.0-rc3 LF=' ' |