chore: typo hunting ft. codespell

11 files changed, 17 insertions, 17 deletions

diff --git a/main.go b/main.go
index dccbe1179..7ed434377 100644
--- a/main.go
+++ b/main.go
@@ -62,7 +62,7 @@ func main() {
 	flaggy.String(&gitDir, "g", "git-dir", "equivalent of the --git-dir git argument")
 
 	customConfig := ""
-	flaggy.String(&customConfig, "ucf", "use-config-file", "Comma seperated list to custom config file(s)")
+	flaggy.String(&customConfig, "ucf", "use-config-file", "Comma separated list to custom config file(s)")
 
 	flaggy.Parse()
 
diff --git a/pkg/cheatsheet/check.go b/pkg/cheatsheet/check.go
index ebcd0629f..6ee4de21f 100644
--- a/pkg/cheatsheet/check.go
+++ b/pkg/cheatsheet/check.go
@@ -17,11 +17,11 @@ func Check() {
 	tmpDir := filepath.Join(os.TempDir(), "lazygit_cheatsheet")
 	err := os.RemoveAll(tmpDir)
 	if err != nil {
-		log.Fatalf("Error occured while checking if cheatsheets are up to date: %v", err)
+		log.Fatalf("Error occurred while checking if cheatsheets are up to date: %v", err)
 	}
 	err = os.Mkdir(tmpDir, 0o700)
 	if err != nil {
-		log.Fatalf("Error occured while checking if cheatsheets are up to date: %v", err)
+		log.Fatalf("Error occurred while checking if cheatsheets are up to date: %v", err)
 	}
 
 	generateAtDir(tmpDir)
@@ -45,7 +45,7 @@ func Check() {
 			Context:  1,
 		})
 		if err != nil {
-			log.Fatalf("Error occured while checking if cheatsheets are up to date: %v", err)
+			log.Fatalf("Error occurred while checking if cheatsheets are up to date: %v", err)
 		}
 		fmt.Printf("\nCheatsheets are out of date. Please run `%s` at the project root and commit the changes\n", CommandToRun())
 		os.Exit(1)
@@ -62,7 +62,7 @@ func obtainContent(dir string) string {
 		if re.MatchString(path) {
 			bytes, err := ioutil.ReadFile(path)
 			if err != nil {
-				log.Fatalf("Error occured while checking if cheatsheets are up to date: %v", err)
+				log.Fatalf("Error occurred while checking if cheatsheets are up to date: %v", err)
 			}
 			content += fmt.Sprintf("\n%s\n\n", filepath.Base(path))
 			content += string(bytes)
@@ -71,7 +71,7 @@ func obtainContent(dir string) string {
 		return nil
 	})
 	if err != nil {
-		log.Fatalf("Error occured while checking if cheatsheets are up to date: %v", err)
+		log.Fatalf("Error occurred while checking if cheatsheets are up to date: %v", err)
 	}
 
 	return content
diff --git a/pkg/commands/git_test.go b/pkg/commands/git_test.go
index 77436130d..a0faf3a78 100644
--- a/pkg/commands/git_test.go
+++ b/pkg/commands/git_test.go
@@ -77,7 +77,7 @@ func TestNavigateToRepoRootDirectory(t *testing.T) {
 			},
 		},
 		{
-			"An error occurred when getting path informations",
+			"An error occurred when getting path information",
 			func(string) (os.FileInfo, error) {
 				return nil, fmt.Errorf("An error occurred")
 			},
diff --git a/pkg/commands/hosting_service/hosting_service_test.go b/pkg/commands/hosting_service/hosting_service_test.go
index f5cbe949e..df326c4ba 100644
--- a/pkg/commands/hosting_service/hosting_service_test.go
+++ b/pkg/commands/hosting_service/hosting_service_test.go
@@ -125,7 +125,7 @@ func TestGetPullRequestURL(t *testing.T) {
 			},
 		},
 		{
-			testName:  "Opens a link to new pull request on Azure DevOps (SSH) with specifc target",
+			testName:  "Opens a link to new pull request on Azure DevOps (SSH) with specific target",
 			from:      "feature/new",
 			to:        "dev",
 			remoteUrl: "git@ssh.dev.azure.com:v3/myorg/myproject/myrepo",
@@ -144,7 +144,7 @@ func TestGetPullRequestURL(t *testing.T) {
 			},
 		},
 		{
-			testName:  "Opens a link to new pull request on Azure DevOps (HTTP) with specifc target",
+			testName:  "Opens a link to new pull request on Azure DevOps (HTTP) with specific target",
 			from:      "feature/new",
 			to:        "dev",
 			remoteUrl: "https://myorg@dev.azure.com/myorg/myproject/_git/myrepo",
diff --git a/pkg/commands/loaders/reflog_commits.go b/pkg/commands/loaders/reflog_commits.go
index 56d10b9f3..4d73adb24 100644
--- a/pkg/commands/loaders/reflog_commits.go
+++ b/pkg/commands/loaders/reflog_commits.go
@@ -57,7 +57,7 @@ func (self *ReflogCommitLoader) GetReflogCommits(lastReflogCommit *models.Commit
 		}
 
 		// note that the unix timestamp here is the timestamp of the COMMIT, not the reflog entry itself,
-		// so two consequetive reflog entries may have both the same SHA and therefore same timestamp.
+		// so two consecutive reflog entries may have both the same SHA and therefore same timestamp.
 		// We use the reflog message to disambiguate, and fingers crossed that we never see the same of those
 		// twice in a row. Reason being that it would mean we'd be erroneously exiting early.
 		if lastReflogCommit != nil && commit.Sha == lastReflogCommit.Sha && commit.UnixTimestamp == lastReflogCommit.UnixTimestamp && commit.Name == lastReflogCommit.Name {
diff --git a/pkg/config/app_config.go b/pkg/config/app_config.go
index e43ea41a7..d041da61c 100644
--- a/pkg/config/app_config.go
+++ b/pkg/config/app_config.go
@@ -235,7 +235,7 @@ func configFilePath(filename string) (string, error) {
 
 var ConfigFilename = "config.yml"
 
-// ConfigFilename returns the filename of the deafult config file
+// ConfigFilename returns the filename of the default config file
 func (c *AppConfig) ConfigFilename() string {
 	return filepath.Join(c.UserConfigDir, ConfigFilename)
 }
diff --git a/pkg/config/user_config.go b/pkg/config/user_config.go
index 321a7fa5e..d5a142b12 100644
--- a/pkg/config/user_config.go
+++ b/pkg/config/user_config.go
@@ -74,7 +74,7 @@ type GitConfig struct {
 	OverrideGpg         bool                          `yaml:"overrideGpg"`
 	DisableForcePushing bool                          `yaml:"disableForcePushing"`
 	CommitPrefixes      map[string]CommitPrefixConfig `yaml:"commitPrefixes"`
-	// this shoudl really be under 'gui', not 'git'
+	// this should really be under 'gui', not 'git'
 	ParseEmoji      bool      `yaml:"parseEmoji"`
 	Log             LogConfig `yaml:"log"`
 	DiffContextSize int       `yaml:"diffContextSize"`
diff --git a/pkg/gui/services/custom_commands/client.go b/pkg/gui/services/custom_commands/client.go
index 3dead7d73..a3452067c 100644
--- a/pkg/gui/services/custom_commands/client.go
+++ b/pkg/gui/services/custom_commands/client.go
@@ -9,7 +9,7 @@ import (
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 )
 
-// Client is the entry point to this package. It reutrns a list of keybindings based on the config's user-defined custom commands.
+// Client is the entry point to this package. It returns a list of keybindings based on the config's user-defined custom commands.
 // See https://github.com/jesseduffield/lazygit/blob/master/docs/Custom_Command_Keybindings.md for more info.
 type Client struct {
 	customCommands    []config.CustomCommand
diff --git a/pkg/integration/integration.go b/pkg/integration/integration.go
index 3edc44939..4f287ab5f 100644
--- a/pkg/integration/integration.go
+++ b/pkg/integration/integration.go
@@ -370,7 +370,7 @@ func generateSnapshot(dir string) (string, error) {
 
 	cmdStrs := []string{
 		`remote show -n origin`, // remote branches
-		// TOOD: find a way to bring this back without breaking tests
+		// TODO: find a way to bring this back without breaking tests
 		// `ls-remote origin`,
 		`status`,                         // file tree
 		`log --pretty=%B -p -1`,          // log
diff --git a/pkg/tasks/tasks_test.go b/pkg/tasks/tasks_test.go
index d580c95f5..9bd552162 100644
--- a/pkg/tasks/tasks_test.go
+++ b/pkg/tasks/tasks_test.go
@@ -69,7 +69,7 @@ func TestNewCmdTaskInstantStop(t *testing.T) {
 	expectedContent := ""
 	actualContent := writer.String()
 	if actualContent != expectedContent {
-		t.Errorf("expected writer to receive the following content: \n%s\n. But instead it recevied: %s", expectedContent, actualContent)
+		t.Errorf("expected writer to receive the following content: \n%s\n. But instead it received: %s", expectedContent, actualContent)
 	}
 }
 
@@ -131,6 +131,6 @@ func TestNewCmdTask(t *testing.T) {
 	expectedContent := "prefix\ntest\n"
 	actualContent := writer.String()
 	if actualContent != expectedContent {
-		t.Errorf("expected writer to receive the following content: \n%s\n. But instead it recevied: %s", expectedContent, actualContent)
+		t.Errorf("expected writer to receive the following content: \n%s\n. But instead it received: %s", expectedContent, actualContent)
 	}
 }
diff --git a/test/repos/unicode_characters.sh b/test/repos/unicode_characters.sh
index 3ae129751..3d1707d56 100755
--- a/test/repos/unicode_characters.sh
+++ b/test/repos/unicode_characters.sh
@@ -6,7 +6,7 @@ git config user.email "test@example.com"
 git config user.name "Lazygit Tester"
 
 
-# Add some ansi, unicode, zero width joiner caracters
+# Add some ansi, unicode, zero width joiner characters
 cat <<EOT >> charstest.txt
 ANSI      Œ	(U+0152	&OElig;	Latin capital ligature OE	Latin Extended-A)
           ¥	(0xA5	U+00A5	&yen;	yes sign)