From 1718a9591cf434f4d45602812b4295cd0f47be79 Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 5 Dec 2019 22:09:01 +0100 Subject: [PATCH] Ensure LF on checkouts and in editors (#9259) This will ensure our repo is always checked out with LF line endings which should help Windows users who have line ending normalization enabled. Additionally, added the LF preference to .editorconfig. --- .editorconfig | 1 + .gitattributes | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.editorconfig b/.editorconfig index 28f1abd3add..ff5c1b2d414 100644 --- a/.editorconfig +++ b/.editorconfig @@ -5,6 +5,7 @@ root = true charset = utf-8 insert_final_newline = true trim_trailing_whitespace = true +end_of_line = lf [*.go] indent_style = tab diff --git a/.gitattributes b/.gitattributes index 56abc3c2bd9..d71939950d6 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,6 +1,7 @@ +* text=auto eol=lf conf/* linguist-vendored docker/* linguist-vendored options/* linguist-vendored public/* linguist-vendored scripts/* linguist-vendored -templates/* linguist-vendored \ No newline at end of file +templates/* linguist-vendored