diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-05-23 14:54:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-05-23 14:54:30 -0700 |
| commit | 8e342255224f459ddff4d7f974161ae47d26d1d7 (patch) | |
| tree | fc6f86ac1e51e7f5db5e101827363e062d092c57 /Documentation/git.txt | |
| parent | Merge branch 'nd/worktree-various-heads' (diff) | |
| parent | convert.c: ident + core.autocrlf didn't work (diff) | |
| download | tgif-8e342255224f459ddff4d7f974161ae47d26d1d7.tar.xz | |
Merge branch 'tb/core-eol-fix'
A couple of bugs around core.autocrlf have been fixed.
* tb/core-eol-fix:
convert.c: ident + core.autocrlf didn't work
t0027: test cases for combined attributes
convert: allow core.autocrlf=input and core.eol=crlf
t0027: make commit_chk_wrnNNO() reliable
Diffstat (limited to 'Documentation/git.txt')
0 files changed, 0 insertions, 0 deletions