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

Add .gitattributes to convert "CR + LF" to "LF" #1688

Merged
merged 1 commit into from Apr 12, 2023
Merged

Add .gitattributes to convert "CR + LF" to "LF" #1688

merged 1 commit into from Apr 12, 2023

Conversation

NimJay
Copy link
Collaborator

@NimJay NimJay commented Apr 12, 2023

Background

  • See my GitHub comment here.
  • LF = "Line Feed" character (moves the cursor to the next line)
  • CR = "Carriage Return" character (brings the cursor to the start of the current line)
  • For marking the end of a line:
    • Linux & Mac use LF.
    • Windows uses CRLF.
  • For more context, see this StackOverflow post.

Fixes

#1434

Change Summary

  • Add a .gitattributes file that converts "CR + LF" to "LF".

Testing Procedure

Related PRs or Issues

NimJay
NimJay commented Apr 12, 2023
View reviewed changes
. gitattributes
# This file configures the git settings for this repository.

# Converts CR + LF to LF when committing, for all "text" files.
* text=auto
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

* text=auto is recommended by GitHub.

text=auto Git will handle the files in whatever way it thinks is best. This is a good default option.

@NimJay NimJay marked this pull request as ready for review April 12, 2023 13:32
@NimJay NimJay requested a review from a team as a code owner April 12, 2023 13:32
@github-actions
Copy link

🚲 PR staged at http://35.238.19.207

bourgeoisor
bourgeoisor approved these changes Apr 12, 2023
View reviewed changes
Copy link
Member

@bourgeoisor bourgeoisor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This LGTM!

@NimJay NimJay merged commit 53e5d2e into main Apr 12, 2023
4 checks passed
@NimJay NimJay deleted the nimjay-gitattributes branch April 12, 2023 19:54
@NimJay NimJay mentioned this pull request Apr 18, 2023
Closed
@NimJay NimJay mentioned this pull request May 29, 2023
Merged
mrcrgl pushed a commit to Even-on-Fridays/microservices-demo that referenced this pull request Sep 11, 2023
@NimJay @mrcrgl
Add .gitattributes to convert "CR + LF" to "LF" (GoogleCloudPlatform#…
aad0afc 
…1688)

This fixes GoogleCloudPlatform#1434.
D-Mwanth pushed a commit to D-Mwanth/microservices-demo that referenced this pull request Mar 6, 2024
@NimJay
Add .gitattributes to convert "CR + LF" to "LF" (GoogleCloudPlatform#…
117467a 
…1688)

This fixes GoogleCloudPlatform#1434.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bourgeoisor bourgeoisor bourgeoisor 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
2 participants
@NimJay @bourgeoisor