diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-08-12 03:41:39 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-08-12 03:41:39 +0300 |
commit | ff66981f4593aec0f3b3eeace0eacb7dbe44fd8c (patch) | |
tree | 89ca69d2484d1dca457a71fc44a6e27f045cdd24 | |
parent | 24966cd9820a6b0d4e348807b07cb9af8ba84fc7 (diff) | |
parent | 75b2f01a0f642b39b0f29b6218515df9b5eb798e (diff) |
Sync with Git 2.22.1
-rw-r--r-- | .mailmap | 1 | ||||
-rw-r--r-- | Documentation/RelNotes/2.22.1.txt | 3 |
2 files changed, 4 insertions, 0 deletions
@@ -210,6 +210,7 @@ Petr Baudis <pasky@ucw.cz> <pasky@suse.cz> Petr Baudis <pasky@ucw.cz> <xpasky@machine> Phil Hord <hordp@cisco.com> <phil.hord@gmail.com> Philip Jägenstedt <philip@foolip.org> <philip.jagenstedt@gmail.com> +Philip Oakley <philipoakley@iee.email> <philipoakley@iee.org> # secondary <philipoakley@dunelm.org.uk> Philipp A. Hartmann <pah@qo.cx> <ph@sorgh.de> Philippe Bruhat <book@cpan.org> Ralf Thielow <ralf.thielow@gmail.com> <ralf.thielow@googlemail.com> diff --git a/Documentation/RelNotes/2.22.1.txt b/Documentation/RelNotes/2.22.1.txt index 76dd8fb578..432762f270 100644 --- a/Documentation/RelNotes/2.22.1.txt +++ b/Documentation/RelNotes/2.22.1.txt @@ -143,5 +143,8 @@ Fixes since v2.22 coding guidelines document did not talk about them and instead had a blanket ban against them. + * 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. Also contains various documentation updates, code clean-ups and minor fixups. |