Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

Line endings normalization (rebased) #121

Merged
merged 1 commit into from Nov 1, 2012

Conversation

Projects
None yet
3 participants
Owner

lyncodev commented Nov 1, 2012

No description provided.

@tdonohue tdonohue added a commit that referenced this pull request Nov 1, 2012

@tdonohue tdonohue Merge pull request #121 from lyncode/line-endings
Line endings normalization (rebased)
51f3b0f

@tdonohue tdonohue merged commit 51f3b0f into DSpace:master Nov 1, 2012

@helix84 helix84 commented on the diff Nov 2, 2012

.gitattributes
@@ -0,0 +1,14 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Standard to msysgit
@helix84

helix84 Nov 2, 2012

Owner

João, what does this mean? These are binary file types. We probably should add a comment directly to the file.

@lyncodev

lyncodev Nov 2, 2012

Owner

It's possible to use git to diff binary files, however we must tell git how to do it.
It maybe useful if, for example, DSpace provides the PDF Manual in his bundle (or other formats).

At the moment, i think those extensions aren't used.

@helix84

helix84 Nov 2, 2012

Owner

Yes, I thought that's what it's for. But why would we want to see diff of binary files? It will be mostly garbage. Maybe sometimes not in case of PDF, but surely DOCX, which is a ZIP file.

And I'm also asking because I didn't find it in the documentation, so I assume it's an "external diff driver", but we don't have it defined.
http://www.kernel.org/pub/software/scm/git/docs/gitattributes.html

@artlowel artlowel pushed a commit to atmire/DSpace that referenced this pull request Jun 13, 2014

@tdonohue tdonohue Merge pull request #121 from lyncode/line-endings
Line endings normalization (rebased)
6b0fef1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment