mirror of
https://github.com/git-for-windows/git.git
synced 2026-06-11 08:30:32 -05:00
b6ee11cd2b
This adds an extensive section about resolving merge conflicts during rebases, which happens quite often in Git for Windows' day-to-day. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
22 lines
880 B
Plaintext
22 lines
880 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
|
|
/t/unit-tests/clar/test/expected/* whitespace=-blank-at-eof
|
|
/templates/hooks/*.sample whitespace=indent,trail,space,incomplete text eol=lf
|