summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsilverwind <me@silverwind.io>2019-12-05 22:09:01 +0100
committerLauris BH <lauris@nix.lv>2019-12-05 23:09:01 +0200
commit1718a9591cf434f4d45602812b4295cd0f47be79 (patch)
tree83b81e8916df4fd1566f3a5ad2aadd1d89782907
parent43f7b97c4a2b17d2a0a3e7a7f97f114aca0592e7 (diff)
downloadgitea-1718a9591cf434f4d45602812b4295cd0f47be79.tar.gz
gitea-1718a9591cf434f4d45602812b4295cd0f47be79.zip
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.
-rw-r--r--.editorconfig1
-rw-r--r--.gitattributes3
2 files changed, 3 insertions, 1 deletions
diff --git a/.editorconfig b/.editorconfig
index 28f1abd3ad..ff5c1b2d41 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 56abc3c2bd..d71939950d 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