Skip to content

Commit

Permalink
chore: fix some comments and typos (#3535)
Browse files Browse the repository at this point in the history
- **PR Description**
fix some comments and typos
  • Loading branch information
stefanhaller committed Apr 28, 2024
2 parents b3a60ce + 0677a58 commit 00c55d5
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion docs/Stacked_Branches.md
Expand Up @@ -13,6 +13,6 @@ includes interactive rebases, so for example amending a commit in the first
branch of the stack will "just work" in the sense that it keeps the other
branches properly stacked onto it.

Lazygit visualizes the invidual branch heads in the stack by marking them with a
Lazygit visualizes the individual branch heads in the stack by marking them with a
cyan asterisk (or a cyan branch symbol if you are using [nerd
fonts](Config.md#display-nerd-fonts-icons)).
2 changes: 1 addition & 1 deletion pkg/commands/git_commands/working_tree.go
Expand Up @@ -363,7 +363,7 @@ func (self *WorkingTreeCommands) ResetAndClean() error {
return self.RemoveUntrackedFiles()
}

// ResetHardHead runs `git reset --hard`
// ResetHard runs `git reset --hard`
func (self *WorkingTreeCommands) ResetHard(ref string) error {
cmdArgs := NewGitCmd("reset").Arg("--hard", ref).
ToArgv()
Expand Down
2 changes: 1 addition & 1 deletion pkg/gui/controllers/undo_controller.go
Expand Up @@ -16,7 +16,7 @@ import (
// we then do the reverse of what that reflog describes.
// When we do this, we create a new reflog entry, and tag it as either an undo or redo
// Then, next time we want to undo, we'll use those entries to know which user-initiated
// actions we can skip. E.g. if I do do three things, A, B, and C, and hit undo twice,
// actions we can skip. E.g. if I do three things, A, B, and C, and hit undo twice,
// the reflog will read UUCBA, and when I read the first two undos, I know to skip the following
// two user actions, meaning we end up undoing reflog entry C. Redoing works in a similar way.

Expand Down
2 changes: 1 addition & 1 deletion pkg/gui/filetree/build_tree_test.go
Expand Up @@ -127,7 +127,7 @@ func TestBuildTreeFromFiles(t *testing.T) {
expected: &Node[models.File]{
Path: "",
// it is a little strange that we're not bubbling up our merge conflict
// here but we are technically still in in tree mode and that's the rule
// here but we are technically still in tree mode and that's the rule
Children: []*Node[models.File]{
{
File: &models.File{Name: "a"},
Expand Down

0 comments on commit 00c55d5

Please sign in to comment.