aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Rebert <[email protected]>2015-02-16 22:27:31 -0800
committerChris Rebert <[email protected]>2015-02-16 22:27:31 -0800
commit40961659acf84a8b0952f87e9a46462fac7a7e24 (patch)
tree7bfdb8469f4504578f9ab4844a6b1628df717928
parent75b311552e5ed1f2761f916aff1a0cbac2f888b9 (diff)
downloadbootstrap-40961659acf84a8b0952f87e9a46462fac7a7e24.tar.xz
bootstrap-40961659acf84a8b0952f87e9a46462fac7a7e24.zip
.gitattributes: treat source maps as binary files
-rw-r--r--.gitattributes2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
index 0c55e2f59..f14050368 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -7,6 +7,8 @@
*.md text eol=lf
*.svg text eol=lf
*.yml text eol=lf
+# Don't diff or textually merge source maps
+*.map binary
bootstrap-theme.css linguist-vendored=false
bootstrap.css linguist-vendored=false