Skip to content

Introduce .gitattributes file and normalize line endings #326

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.

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

Merged
merged 2 commits into from
Aug 9, 2015

Conversation

rcdailey
Copy link
Contributor

@rcdailey rcdailey commented Aug 9, 2015

Per discussion in PR #325, I am also proposing a .gitattributes file to assist in enforcing a consistent line ending handling scheme across the repository regardless of user's git configuration (This is the most modern and recommended way to handle EOL in Git).

Any other diff changes seen are nothing but EOL normalization. No code was modified.

If you prefer to perform the EOL normalization yourself, I can remove the tip commit for you. Or feel free to cherry pick the .gitattributes in by hand and do it yourself. Up to you. This should at least help you get started.

This commit contains nothing but line ending normalization
changes. These changes were performed after the introduction
of .gitattributes into the repository.
@rcdailey
Copy link
Contributor Author

rcdailey commented Aug 9, 2015

I see that you've replied to #325 and already added your own .gitattributes file here: 578ee9d

In that case, I will close this PR with two recommendations:

  1. Verify my .gitattributes against yours and copy in any changes you'd like
    • You don't need to manually specify text files as text unless you've observed that git does not auto-detect them as text files. You will avoid obfuscating your .gitattributes file if you let it do the work for you. Git is pretty smart about finding text files.
  2. Normalize your line endings (git rm -r --cached . && git reset --hard && git commit -a)

@rcdailey rcdailey closed this Aug 9, 2015
@cdunn2001 cdunn2001 reopened this Aug 9, 2015
cdunn2001 added a commit that referenced this pull request Aug 9, 2015
Introduce .gitattributes file and normalize line endings
@cdunn2001 cdunn2001 merged commit 9f7dbcb into open-source-parsers:master Aug 9, 2015
@rcdailey rcdailey deleted the git-attributes branch August 16, 2015 14:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants