diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-11-17 12:55:09 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-11-17 12:55:09 +0000 |
| commit | c7536f16cb5c480a688a7962cff4550c3504d5b9 (patch) | |
| tree | f55480b1ec0bbacf8fa64ca4a22802c6774388ac | |
| parent | 83ec4aadd69eacec05a802e92c57e307bc38fe65 (diff) | |
| parent | 9960383925aae6389d1e5730f47f4fb637f363e9 (diff) | |
| download | pleroma-c7536f16cb5c480a688a7962cff4550c3504d5b9.tar.gz pleroma-c7536f16cb5c480a688a7962cff4550c3504d5b9.zip | |
Merge branch 'feat/add-bundles-to-gitattributes' into 'develop'
.gitattributes: Treat js/css/source maps as binary files
See merge request pleroma/pleroma!3153
| -rw-r--r-- | .gitattributes | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index c46415a5c..68895bf88 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,8 @@ *.ex diff=elixir *.exs diff=elixir +# At the time of writing all js/css files included +# in the repo are minified bundles, and we don't want +# to search/diff those as text files. +*.js binary +*.js.map binary +*.css binary |