diff options
| -rw-r--r-- | pkg/commands/branch.go | 2 | ||||
| -rw-r--r-- | pkg/commands/git.go | 2 | ||||
| -rw-r--r-- | pkg/commands/stash_entry.go | 2 | ||||
| -rw-r--r-- | pkg/config/app_config.go | 2 | ||||
| -rw-r--r-- | pkg/git/commit_list_builder.go | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/pkg/commands/branch.go b/pkg/commands/branch.go index 6f7a1c31e..cbcab2712 100644 --- a/pkg/commands/branch.go +++ b/pkg/commands/branch.go @@ -18,7 +18,7 @@ type Branch struct { Selected bool } -// GetDisplayStrings returns the dispaly string of branch +// GetDisplayStrings returns the display string of branch func (b *Branch) GetDisplayStrings(isFocused bool) []string { displayName := utils.ColoredString(b.Name, b.GetColor()) if isFocused && b.Selected && b.Pushables != "" && b.Pullables != "" { diff --git a/pkg/commands/git.go b/pkg/commands/git.go index 2a52ee119..fa1a73157 100644 --- a/pkg/commands/git.go +++ b/pkg/commands/git.go @@ -140,7 +140,7 @@ func findDotGitDir(stat func(string) (os.FileInfo, error), readFile func(filenam return strings.TrimSpace(strings.TrimPrefix(fileContent, "gitdir: ")), nil } -// GetStashEntries stash entryies +// GetStashEntries stash entries func (c *GitCommand) GetStashEntries() []*StashEntry { rawString, _ := c.OSCommand.RunCommandWithOutput("git stash list --pretty='%gs'") stashEntries := []*StashEntry{} diff --git a/pkg/commands/stash_entry.go b/pkg/commands/stash_entry.go index a9cfd95bf..a47200fd4 100644 --- a/pkg/commands/stash_entry.go +++ b/pkg/commands/stash_entry.go @@ -7,7 +7,7 @@ type StashEntry struct { DisplayString string } -// GetDisplayStrings returns the dispaly string of branch +// GetDisplayStrings returns the display string of branch func (s *StashEntry) GetDisplayStrings(isFocused bool) []string { return []string{s.DisplayString} } diff --git a/pkg/config/app_config.go b/pkg/config/app_config.go index b35294a11..d5a880b72 100644 --- a/pkg/config/app_config.go +++ b/pkg/config/app_config.go @@ -196,7 +196,7 @@ func (c *AppConfig) WriteToUserConfig(key, value string) error { return v.WriteConfig() } -// SaveAppState marhsalls the AppState struct and writes it to the disk +// SaveAppState marshalls the AppState struct and writes it to the disk func (c *AppConfig) SaveAppState() error { marshalledAppState, err := yaml.Marshal(c.AppState) if err != nil { diff --git a/pkg/git/commit_list_builder.go b/pkg/git/commit_list_builder.go index f3ba685f6..60ac22f4a 100644 --- a/pkg/git/commit_list_builder.go +++ b/pkg/git/commit_list_builder.go @@ -177,7 +177,7 @@ func (c *CommitListBuilder) getNormalRebasingCommits() ([]*commands.Commit, erro func (c *CommitListBuilder) getInteractiveRebasingCommits() ([]*commands.Commit, error) { bytesContent, err := ioutil.ReadFile(fmt.Sprintf("%s/rebase-merge/git-rebase-todo", c.GitCommand.DotGitDir)) if err != nil { - c.Log.Info(fmt.Sprintf("error occured reading git-rebase-todo: %s", err.Error())) + c.Log.Info(fmt.Sprintf("error occurred reading git-rebase-todo: %s", err.Error())) // we assume an error means the file doesn't exist so we just return return nil, nil } |