mirror of
				https://github.com/jesseduffield/lazygit.git
				synced 2025-10-30 23:57:43 +02:00 
			
		
		
		
	chore: fix some comments and typos
Signed-off-by: knowmost <knowmost@outlook.com>
This commit is contained in:
		| @@ -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)). | ||||
|   | ||||
| @@ -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() | ||||
|   | ||||
| @@ -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. | ||||
|  | ||||
|   | ||||
| @@ -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"}, | ||||
|   | ||||
		Reference in New Issue
	
	Block a user