From 6a235dc2a951d4cde7f36ca2223e1c3531577ef1 Mon Sep 17 00:00:00 2001 From: Jait Jacob Date: Sun, 25 Feb 2024 01:01:40 +0530 Subject: [PATCH 1/3] configure git to handle line endings --- .gitattributes | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitattributes b/.gitattributes index 5e8f630ba7..6a39daf6cb 100644 --- a/.gitattributes +++ b/.gitattributes @@ -9,3 +9,6 @@ /docs/** linguist-documentation /docs/analytics/** -linguist-documentation /website/** linguist-documentation + +# Auto detect text files and perform LF normalization +* text=auto \ No newline at end of file From a6f3d35b61aa1ddd5000a164d4529227186ed064 Mon Sep 17 00:00:00 2001 From: Jait Jacob Date: Mon, 26 Feb 2024 10:50:06 +0530 Subject: [PATCH 2/3] git config to handle line endings --- .gitattributes | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 6a39daf6cb..59b08deb07 100644 --- a/.gitattributes +++ b/.gitattributes @@ -10,5 +10,16 @@ /docs/analytics/** -linguist-documentation /website/** linguist-documentation +<<<<<<< Updated upstream # Auto detect text files and perform LF normalization -* text=auto \ No newline at end of file +* text=auto +======= +# Set the default behavior, in case people don't have core.autocrlf set. +* text=auto + +# Explicitly declare text files you want to always be normalized and converted +# to native line endings on checkout. +*.cpp text +*.h text +*.pot +>>>>>>> Stashed changes From 33d219324a60e2d60fbcddadc106931c61254e96 Mon Sep 17 00:00:00 2001 From: Jait Jacob Date: Mon, 26 Feb 2024 10:53:22 +0530 Subject: [PATCH 3/3] remove unwanted lines --- .gitattributes | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.gitattributes b/.gitattributes index 59b08deb07..c1789ac373 100644 --- a/.gitattributes +++ b/.gitattributes @@ -10,10 +10,6 @@ /docs/analytics/** -linguist-documentation /website/** linguist-documentation -<<<<<<< Updated upstream -# Auto detect text files and perform LF normalization -* text=auto -======= # Set the default behavior, in case people don't have core.autocrlf set. * text=auto @@ -22,4 +18,3 @@ *.cpp text *.h text *.pot ->>>>>>> Stashed changes