From 94a1c27916a19af4eb5a57baa22a3a529765c4a2 Mon Sep 17 00:00:00 2001 From: stk Date: Sun, 30 Jun 2024 11:11:17 +0200 Subject: [PATCH 1/3] Normalize line endings of docs/README.md For some reason this was checked in with CRLF line endings; change it to just LF, like all other text files. --- docs/README.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/README.md b/docs/README.md index d840637a0..1bc0bb6be 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,11 +1,11 @@ -# Documentation Overview - -* [Configuration](./Config.md). -* [Custom Commands](./Custom_Command_Keybindings.md) -* [Custom Pagers](./Custom_Pagers.md) -* [Dev docs](./dev) -* [Keybindings](./keybindings) -* [Undo/Redo](./Undoing.md) -* [Range Select](./Range_Select.md) -* [Searching/Filtering](./Searching.md) -* [Stacked Branches](./Stacked_Branches.md) +# Documentation Overview + +* [Configuration](./Config.md). +* [Custom Commands](./Custom_Command_Keybindings.md) +* [Custom Pagers](./Custom_Pagers.md) +* [Dev docs](./dev) +* [Keybindings](./keybindings) +* [Undo/Redo](./Undoing.md) +* [Range Select](./Range_Select.md) +* [Searching/Filtering](./Searching.md) +* [Stacked Branches](./Stacked_Branches.md) From 61313e5dfa69747abc1d11b4e3b4768f9485dbac Mon Sep 17 00:00:00 2001 From: stk Date: Sun, 30 Jun 2024 11:15:19 +0200 Subject: [PATCH 2/3] Add .gitattributes file This tells git to checkout all .md and .json files with Unix line feeds, even on Windows. This shouldn't be a problem for working with these files on Windows, as all modern text editors and IDEs should be capable of editing Unix files transparently; but it makes it possible to run `go generate ./...` on Windows, which assumes Unix line feeds in a few places. --- .gitattributes | 3 +++ .gitignore | 1 + 2 files changed, 4 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..8143bb75f --- /dev/null +++ b/.gitattributes @@ -0,0 +1,3 @@ +*.go text +*.md text eol=lf +*.json text eol=lf diff --git a/.gitignore b/.gitignore index 2fc9940dc..09340a6c9 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,7 @@ lazygit.exe # Exceptions !.gitignore +!.gitattributes !.goreleaser.yml !.golangci.yml !.circleci/ From 71a62b7573d0b913e5e58af30fb6b66b42036e78 Mon Sep 17 00:00:00 2001 From: Stefan Haller Date: Sun, 30 Jun 2024 11:36:02 +0200 Subject: [PATCH 3/3] Re-add a vendor .gitattributes file This was previously ignored by our top-level .gitignore file; now that we no longer do that, running `go mod vendor` brings it back. --- vendor/github.com/kevinburke/ssh_config/.gitattributes | 1 + 1 file changed, 1 insertion(+) create mode 100644 vendor/github.com/kevinburke/ssh_config/.gitattributes diff --git a/vendor/github.com/kevinburke/ssh_config/.gitattributes b/vendor/github.com/kevinburke/ssh_config/.gitattributes new file mode 100644 index 000000000..44db58188 --- /dev/null +++ b/vendor/github.com/kevinburke/ssh_config/.gitattributes @@ -0,0 +1 @@ +testdata/dos-lines eol=crlf