From f146a2a5ac1dbcac0e779c4f79e787b641eb26aa Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Mon, 20 May 2019 17:09:53 -0700 Subject: [PATCH] Revert "gitattributes: Mark yarn.lock as "binary", i.e. suppress diffs." This reverts commit a717ac6d85c4992d19725139ddda3f699bf41b4e. .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 --- .gitattributes | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 0259300dad..4720eb2aa5 100644 --- a/.gitattributes +++ b/.gitattributes @@ -11,4 +11,3 @@ *.otf binary *.tif binary *.ogg binary -yarn.lock binary