Skip to content

Commit

Permalink
Re #6308. Add a .gitattributes file setting the new 'text' attribute
Browse files Browse the repository at this point in the history
From git 1.7.2, there's a new way of dealing with line endings.
This setting of the attribute should mean that developers get their
native line endings locally, but that we only get LF endings in the repo.
Requiring everyone to set a config property to enforce this should
no longer be necessary.
  • Loading branch information
RussellTaylor committed Dec 11, 2012
1 parent be398aa commit 6e76353
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
4 changes: 4 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Set default behaviour, in case users don't have core.autocrlf set.
# See https://help.github.com/articles/dealing-with-line-endings#platform-all for more info
# N.B. Only works with git client 1.7.2+
* text=auto
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@

# **** 'Personal' entries don't belong in here - put them in your .git/info/exclude file ****

# Ignore gitatrributes file
.gitattributes

# Ignore text editor (e.g. emacs) autosave files
*~

Expand Down

0 comments on commit 6e76353

Please sign in to comment.