mirror of
https://github.com/git/git.git
synced 2025-12-05 18:47:16 -06:00
3b212a83fe
Both "git apply" and "git diff" learn a new whitespace error class, "incomplete-line". * jc/whitespace-incomplete-line: attr: enable incomplete-line whitespace error for this project diff: highlight and error out on incomplete lines apply: check and fix incomplete lines whitespace: allocate a few more bits and define WS_INCOMPLETE_LINE apply: revamp the parsing of incomplete lines diff: update the way rewrite diff handles incomplete lines diff: call emit_callback ecbdata everywhere diff: refactor output of incomplete line diff: keep track of the type of the last line seen diff: correct suppress_blank_empty hack diff: emit_line_ws_markup() if/else style fix whitespace: correct bit assignment comments
20 lines
741 B
Plaintext
20 lines
741 B
Plaintext
* whitespace=trail,space
|
|
*.[ch] whitespace=indent,trail,space,incomplete diff=cpp
|
|
*.sh whitespace=indent,trail,space,incomplete text eol=lf
|
|
*.perl text eol=lf diff=perl
|
|
*.pl text eof=lf diff=perl
|
|
*.pm text eol=lf diff=perl
|
|
*.py text eol=lf diff=python
|
|
*.bat text eol=crlf
|
|
CODE_OF_CONDUCT.md -whitespace
|
|
/Documentation/**/*.adoc text eol=lf whitespace=trail,space,incomplete
|
|
/command-list.txt text eol=lf
|
|
/GIT-VERSION-GEN text eol=lf
|
|
/mergetools/* text eol=lf
|
|
/t/oid-info/* text eol=lf
|
|
/Documentation/git-merge.adoc conflict-marker-size=32
|
|
/Documentation/git-merge-file.adoc conflict-marker-size=32
|
|
/Documentation/gitk.adoc conflict-marker-size=32
|
|
/Documentation/user-manual.adoc conflict-marker-size=32
|
|
/t/t????-*.sh conflict-marker-size=32
|