diff options
| author | David Pursehouse <dpursehouse@collab.net> | 2016-06-29 05:42:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-06-29 05:42:20 +0000 |
| commit | faaddc9b4e4c6f6cbac02e90415676fabd177b99 (patch) | |
| tree | ca9fb9f43739196eeb1dd98503040683222a9771 | |
| parent | a36af0767bd180ac82c9ae4a1ae8418aa2dbec3f (diff) | |
| parent | 01952e6634441291f5909c4e88639593a9a539f7 (diff) | |
| download | git-repo-faaddc9b4e4c6f6cbac02e90415676fabd177b99.tar.gz | |
Merge "Adds additional crlf clobber avoidance."
| -rw-r--r-- | .gitattributes | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes index d65028a4..cdd8546d 100644 --- a/.gitattributes +++ b/.gitattributes | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # Prevent /bin/sh scripts from being clobbered by autocrlf=true | 1 | # Prevent /bin/sh scripts from being clobbered by autocrlf=true |
| 2 | git_ssh text eol=lf | 2 | git_ssh text eol=lf |
| 3 | main.py text eol=lf | ||
| 4 | repo text eol=lf | 3 | repo text eol=lf |
| 4 | hooks/* text eol=lf | ||