diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-10-05 14:01:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-10-05 14:01:56 -0700 |
| commit | 542b3c2573c7682e9ffebe755272c7e39651f9ae (patch) | |
| tree | 8395577c31e6eda8a21b03b45d636dc7ff7f1470 /Documentation/config/mergetool.txt | |
| parent | Merge branch 'sn/fast-import-doc' (diff) | |
| parent | credential: treat CR/LF as line endings in the credential protocol (diff) | |
| download | tgif-542b3c2573c7682e9ffebe755272c7e39651f9ae.tar.xz | |
Merge branch 'nl/credential-crlf'
Loosen the parser in the receiving end of the credential protocol
to allow credential helper to terminate lines with CRLF line
ending, as well as LF line ending.
* nl/credential-crlf:
credential: treat CR/LF as line endings in the credential protocol
Diffstat (limited to 'Documentation/config/mergetool.txt')
0 files changed, 0 insertions, 0 deletions