From 0198c33d859e201404d60804f5deb8748a88dce7 Mon Sep 17 00:00:00 2001 From: Max-Julian Jakobitsch Date: Fri, 14 Jun 2024 19:30:23 +0200 Subject: [PATCH 1/3] chore: remove defunct .gitconfig not actually used by git, see https://git-scm.com/docs/git-config and https://stackoverflow.com/q/18329621 --- .gitconfig | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 .gitconfig diff --git a/.gitconfig b/.gitconfig deleted file mode 100644 index b2274475fc..0000000000 --- a/.gitconfig +++ /dev/null @@ -1,5 +0,0 @@ -[core] - whitespace = blank-at-eol,blank-at-eof,space-before-tab - autocrlf = input -[apply] - whitespace = fix From 175cdf3fff5680692748045308832c9cd7ed2310 Mon Sep 17 00:00:00 2001 From: Max Jakobitsch Date: Wed, 12 Feb 2025 09:00:51 +0100 Subject: [PATCH 2/3] docs: add git config items to docs --- doc/buildAndProgram.md | 7 ++++++- doc/buildWithDocker.md | 6 +++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/doc/buildAndProgram.md b/doc/buildAndProgram.md index 69e4bfd836..06346e8152 100644 --- a/doc/buildAndProgram.md +++ b/doc/buildAndProgram.md @@ -24,10 +24,15 @@ To build this project, you'll need: ### Clone the repo -``` +```sh git clone https://github.com/InfiniTimeOrg/InfiniTime.git cd InfiniTime git submodule update --init + +# configure git to apply whitespace fixes automatically +git config set core.whitespace trailing-space,space-before-tab +git config set apply.whitespace fix + mkdir build cd build ``` diff --git a/doc/buildWithDocker.md b/doc/buildWithDocker.md index 670590a645..9ad65fec90 100644 --- a/doc/buildWithDocker.md +++ b/doc/buildWithDocker.md @@ -15,10 +15,14 @@ Based on Ubuntu 22.04 with the following build dependencies: Before building, local repository must be fully initialized. -``` +```sh git clone https://github.com/InfiniTimeOrg/InfiniTime.git cd InfiniTime git submodule update --init + +# configure git to apply whitespace fixes automatically +git config set core.whitespace trailing-space,space-before-tab +git config set apply.whitespace fix ``` ## Run a container to build the project From 6c8562bd1a914c120c0f3c53f0d3398832596531 Mon Sep 17 00:00:00 2001 From: Max Jakobitsch Date: Fri, 14 Feb 2025 09:13:52 +0100 Subject: [PATCH 3/3] Revert "docs: add git config items to docs" This reverts commit 4066cc03004c89a7ac4d5a7a327729184ecac7b6. --- doc/buildAndProgram.md | 7 +------ doc/buildWithDocker.md | 6 +----- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/doc/buildAndProgram.md b/doc/buildAndProgram.md index 06346e8152..69e4bfd836 100644 --- a/doc/buildAndProgram.md +++ b/doc/buildAndProgram.md @@ -24,15 +24,10 @@ To build this project, you'll need: ### Clone the repo -```sh +``` git clone https://github.com/InfiniTimeOrg/InfiniTime.git cd InfiniTime git submodule update --init - -# configure git to apply whitespace fixes automatically -git config set core.whitespace trailing-space,space-before-tab -git config set apply.whitespace fix - mkdir build cd build ``` diff --git a/doc/buildWithDocker.md b/doc/buildWithDocker.md index 9ad65fec90..670590a645 100644 --- a/doc/buildWithDocker.md +++ b/doc/buildWithDocker.md @@ -15,14 +15,10 @@ Based on Ubuntu 22.04 with the following build dependencies: Before building, local repository must be fully initialized. -```sh +``` git clone https://github.com/InfiniTimeOrg/InfiniTime.git cd InfiniTime git submodule update --init - -# configure git to apply whitespace fixes automatically -git config set core.whitespace trailing-space,space-before-tab -git config set apply.whitespace fix ``` ## Run a container to build the project