Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Modify .gitattributes, set eol=lf, where appropriate #15752

Merged
merged 1 commit into from Jan 5, 2022
Merged

Modify .gitattributes, set eol=lf, where appropriate #15752

merged 1 commit into from Jan 5, 2022
+57 −56

Conversation

tzarc
Copy link
Member

@tzarc tzarc commented Jan 5, 2022 •
edited

Description

Had a few commits recently with crlf line endings, which causes havoc with merges and tooling and the like.
Hopefully this mitigates a bunch of that.

*.bat,*.ini explicitly set to crlf, and *.cmd added and set similarly.

Types of Changes

  • Core
  • Bugfix
  • New feature
  • Enhancement/optimization
  • Keyboard (addition or update)
  • Keymap/layout/userspace (addition or update)
  • Documentation

Checklist

  • My code follows the code style of this project: C, Python
  • I have read the PR Checklist document and have made the appropriate changes.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • I have tested the changes and verified that they work and don't break anything (as well as I can manage).

@tzarc tzarc requested a review from a team January 5, 2022 20:10
@drashna drashna requested a review from a team January 5, 2022 20:22
@tzarc tzarc changed the title Modify .gitattributes, set eol=lf, where appropriate Modify .gitattributes, set eol=lf, where appropriate Jan 5, 2022
@zvecr zvecr merged commit 7b15114 into qmk:master Jan 5, 2022
@tzarc tzarc deleted the gitattributes-line-endings branch January 6, 2022 03:46
ryphon pushed a commit to ryphon/qmk_firmware that referenced this pull request Jan 12, 2022
@tzarc @ryphon
eol=lf, where appropriate (qmk#15752)
bf5e456
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@drashna drashna drashna approved these changes

@zvecr zvecr zvecr approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@tzarc @drashna @zvecr