diff options
| -rw-r--r-- | Documentation/RelNotes/2.4.0.txt | 5 | ||||
| -rwxr-xr-x | GIT-VERSION-GEN | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/RelNotes/2.4.0.txt b/Documentation/RelNotes/2.4.0.txt index 730c8f81c3..21df61c3be 100644 --- a/Documentation/RelNotes/2.4.0.txt +++ b/Documentation/RelNotes/2.4.0.txt @@ -5,7 +5,8 @@ Backward compatibility warning(s) --------------------------------- This release has a few changes in the user-visible output from -Porcelain commands, which the users may want to be aware of. +Porcelain commands. These are not meant to be parsed by scripts, but +the users still may want to be aware of the changes: * Output from "git log --decorate" (and "%d" format specifier used in the userformat "--format=<string>" parameter "git log" family of @@ -216,7 +217,7 @@ notes for details). (merge 339de50 dk/format-patch-ignore-diff-submodule later to maint). * After attempting and failing a password-less authentication - (e.g. kerberos), libcURL refuses to fall back to password based + (e.g. Kerberos), libcURL refuses to fall back to password based Basic authentication without a bit of help/encouragement. (merge 4dbe664 bc/http-fallback-to-password-after-krb-fails later to maint). diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 730b3f9fe7..40f8841678 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v2.4.0-rc0 +DEF_VER=v2.4.0-rc1 LF=' ' |