From 44b2e24e47abb5fd8d778fdb71ef4bfaf042e660 Mon Sep 17 00:00:00 2001 From: Sviatoslav Sydorenko Date: Thu, 9 Sep 2021 01:37:19 +0200 Subject: [PATCH 1/3] Indent the autotext gitattributes setup --- .gitattributes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 13bc9c2e..19712147 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,3 @@ # Set default behavior to automatically normalize line endings. -* text=auto +* text=auto From 856069b808682ba564e183b07fd989b1a40cccf7 Mon Sep 17 00:00:00 2001 From: Sviatoslav Sydorenko Date: Thu, 9 Sep 2021 01:33:01 +0200 Subject: [PATCH 2/3] Let Git know to merge everything into changelog --- .gitattributes | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitattributes b/.gitattributes index 19712147..5e3340dc 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,4 @@ # Set default behavior to automatically normalize line endings. * text=auto +CHANGELOG.md merge=union From a2b6217a233a2cc1eab960d3decb253fb3eeed9e Mon Sep 17 00:00:00 2001 From: Sviatoslav Sydorenko Date: Thu, 9 Sep 2021 01:35:26 +0200 Subject: [PATCH 3/3] Set up nicer previews for meta changes --- .gitattributes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitattributes b/.gitattributes index 5e3340dc..2defd70b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2,3 +2,8 @@ * text=auto CHANGELOG.md merge=union + +*.lock text -diff +package.json text eol=lf +package-lock.json text -diff +yarn.lock text -diff