Introduce .gitattributes; normalize files.#163
Open
ewhac wants to merge 2 commits intofte-team:masterfrom
Open
Introduce .gitattributes; normalize files.#163ewhac wants to merge 2 commits intofte-team:masterfrom
ewhac wants to merge 2 commits intofte-team:masterfrom
Conversation
Now that FTE has made the transition from Subversion to Git, use a
.gitattributes file to handle newline conversions between different
platforms. Normalize all relevant text files.
To normalize your local working copy:
- Ensure you have a clean working tree (`git stash` can help here),
- `git pull` to this commit.
- Delete all files in your working copy (except for .git* files),
- `git checkout -- .` This will re-populate your working copy from
the git repo with newlines appropriate for your platform.
See gitattributes(7) for more details.
Help keep unwanted files/directories from being considered for checkin.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Now that FTE has made the transition from Subversion to Git, use a .gitattributes file to handle newline conversions between different platforms. Normalize all relevant text files.
To normalize your local working copy:
git stashcan help here),git pullto this commit.git checkout -- .This will re-populate your working copy from the git repo with newlines appropriate for your platform.See gitattributes(7) for more details.