Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "gitattributes: Mark yarn.lock as "binary", i.e. suppress diffs." 

This reverts commit a717ac6d85.

.gitattributes affects the behavior of many Git operations like rebase
and merge and mergetool, not just the output of show and diff.
Treating yarn.lock as binary was making it too hard to deal with
yarn.lock diffs when we actually needed them.  Also, the GitHub
website ignores this setting and suppresses large parts of diffs
regardless.

Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
This commit is contained in:
Anders Kaseorg 2019-05-20 17:09:53 -07:00 committed by Anders Kaseorg
parent 2f43284dd8
commit f146a2a5ac
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -11,4 +11,3 @@
*.otf binary
*.tif binary
*.ogg binary
yarn.lock binary