diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-07-29 12:51:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-29 12:51:24 -0700 |
| commit | 026dd738a6e5f1e42ef0f390feacb5ed6acc4ee8 (patch) | |
| tree | a2d9fbe5904dd76315ea200deb348ea17429df6a | |
| parent | Sync with maint (diff) | |
| download | tgif-026dd738a6e5f1e42ef0f390feacb5ed6acc4ee8.tar.xz | |
Git 2.23-rc0
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/RelNotes/2.23.0.txt | 5 | ||||
| -rwxr-xr-x | GIT-VERSION-GEN | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Documentation/RelNotes/2.23.0.txt b/Documentation/RelNotes/2.23.0.txt index 5cae42b7af..9896599b2f 100644 --- a/Documentation/RelNotes/2.23.0.txt +++ b/Documentation/RelNotes/2.23.0.txt @@ -378,6 +378,11 @@ Fixes since v2.22 having to consult the other end, which has been corrected. (merge 2581ea3d31 es/local-atomic-push-failure-with-http later to maint). + * The internal diff machinery can be made to read out of bounds while + looking for --funcion-context line in a corner case, which has been + corrected. + (merge b777f3fd61 jk/xdiff-clamp-funcname-context-index later to maint). + * Other code cleanup, docfix, build fix, etc. (merge f547101b26 es/git-debugger-doc later to maint). (merge 7877ac3d7b js/bisect-helper-check-get-oid-return-value later to maint). diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 122f6479ef..a0766f64ed 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v2.22.GIT +DEF_VER=v2.23.0-rc0 LF=' ' |