luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3810 from dwijnand/no-contraband-diff 

Exclude contraband generated files from diff by default
This commit is contained in:
eugene yokota 2017-12-14 08:09:20 -05:00 committed by GitHub
parent 3d45f82e75 843210598b
commit aeb09fcbf4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitattributes vendored
View File

@ -5,3 +5,7 @@
# to native line endings on checkout. # to native line endings on checkout.
*.scala text *.scala text
*.java text *.java text
# Exclude contraband generated files from diff (by default - you can see it if you want)
**/contraband-scala/**/* -diff merge=ours
**/contraband-scala/**/* linguist-generated=true