Skip to content
This repository was archived by the owner on Dec 11, 2021. It is now read-only.

Use .gitattributes to normalise line endings on check-in#2

Merged
jb3 merged 2 commits into
mainfrom
gitattributes
Jul 10, 2021
Merged

Use .gitattributes to normalise line endings on check-in#2
jb3 merged 2 commits into
mainfrom
gitattributes

Conversation

@MarkKoz
Copy link
Copy Markdown
Contributor

@MarkKoz MarkKoz commented Mar 13, 2021

Remove the mixed line endings pre-commit hook because it is obsolete.

Relying on git to handle line endings means contributors have more flexibility with which line endings they want to use on check-out. The settings in .gitattributes only impose which line endings will be used upon check-in (LF), which should not impact local development; git will still respect the core.eol and core.autocrlf settings.

Remove the mixed line endings pre-commit hook because it is obsolete.

Relying on git to handle line endings means contributors have more
flexibility with which line endings they want to use on check-out.
The settings in .gitattributes only impose which line endings will
be used upon check-in (LF), which should not impact local development;
git will still respect the core.eol and core.autocrlf settings.
@MarkKoz MarkKoz added priority: low type: enhancement Changes or improvements to existing features labels Mar 13, 2021
@jchristgit
Copy link
Copy Markdown
Contributor

@MarkKoz, could you resolve conflicts here?

@jb3
Copy link
Copy Markdown
Member

jb3 commented Jul 10, 2021

Presumably the only conflict here is that .pre-commit-config.yaml was removed, I'll solve that quickly so we can get this in.

@jb3 jb3 merged commit c453142 into main Jul 10, 2021
@jb3 jb3 deleted the gitattributes branch July 10, 2021 19:59
@jchristgit
Copy link
Copy Markdown
Contributor

jchristgit commented Jul 10, 2021 via email

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

priority: low type: enhancement Changes or improvements to existing features

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants