From 9da0bd1fbdb1897db7acd15fdeaa6211b25294c2 Mon Sep 17 00:00:00 2001
From: Marcel Ribeiro-Dantas <mribeirodantas@hey.com>
Date: Mon, 12 Feb 2024 00:54:11 -0300
Subject: [PATCH 1/2] Fix typos
---
README.md | 2 +-
levels/index/add | 2 +-
levels/stash/stash-merge | 2 +-
scenes/game.gd | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/README.md b/README.md
index 3183206..2717850 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ Wanna build your own level? Great! Here's how to do it:
1. Run the game – the easiest way to do so is to run `godot scenes/main.tscn` from the project directory.
1. Get a bit familiar with the levels which are currently there.
1. Take a look into the `levels` directory. It's split into chapters, and each level is a file.
-1. Make a copy of an existing level or start writing your own. See the documention of the format below.
+1. Make a copy of an existing level or start writing your own. See the documentation of the format below.
1. Write and test your level. If you're happy with it, feel free to send it to us in a pull request! <3
### Level format
diff --git a/levels/index/add b/levels/index/add
index e627917..b68f357 100644
--- a/levels/index/add
+++ b/levels/index/add
@@ -35,4 +35,4 @@ test "$(git show main^:c)" != "c"
[congrats]
-Well done! Try tavelling between the commits using `git checkout`, so you can look at their contents again!
+Well done! Try travelling between the commits using `git checkout`, so you can look at their contents again!
diff --git a/levels/stash/stash-merge b/levels/stash/stash-merge
index a8c9ac1..edab359 100644
--- a/levels/stash/stash-merge
+++ b/levels/stash/stash-merge
@@ -39,7 +39,7 @@ git add recipe
[win]
-# Did you resolve the confict and commit?
+# Did you resolve the conflict and commit?
{ git show HEAD | grep "Flour"; } && { git show HEAD | grep "Salt"; }
# Did you clear stash stack?
diff --git a/scenes/game.gd b/scenes/game.gd
index 2f2a0b5..b9cab74 100644
--- a/scenes/game.gd
+++ b/scenes/game.gd
@@ -74,7 +74,7 @@ func shell_received(text):
func _notification(what):
if what == MainLoop.NOTIFICATION_WM_QUIT_REQUEST:
- #get_tree().quit() # default behavio
+ #get_tree().quit() # default behavior
get_tree().change_scene("res://scenes/survey.tscn")
From 1a8fe69f7a6f1034d4c0a7e207ff82ba38e682de Mon Sep 17 00:00:00 2001
From: wyattscarpenter <wyattscarpenter@gmail.com>
Date: Thu, 22 Aug 2024 01:28:06 -0700
Subject: [PATCH 2/2] Update reflog: Grammar
This commit is comprised of three changes; two stylistic and one grammatical error fix:
1. change "commit in the past" to "past commit", which flows better in the sentence
2. change "on which past commit you were before" to "which past commit you were on before". While both sentences are grammatical, the former is likely to confuse the reader momentarily because the "on" has to take a long and unexpected journey to land in between "were" and "before".
3. "your HEAD did point to" to "your HEAD has pointed to". This changes the tense to present perfect, which is correct in this circumstance.
The commas in the description are technically ungrammatical, or would be judged so by some, but I like the tone they convey, so I left them.
---
levels/shit-happens/reflog | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/levels/shit-happens/reflog b/levels/shit-happens/reflog
index e21c4e7..5ebb78f 100644
--- a/levels/shit-happens/reflog
+++ b/levels/shit-happens/reflog
@@ -5,9 +5,9 @@ cards = checkout reflog
Say you were looking at something in the past, and then switched back to the main branch.
-But then, you got reaaally distracted, and after your lunch break, you can't remember on which commit in the past you were before. How can you find out?
+But then, you got reaaally distracted, and after your lunch break, you can't remember which past commit you were on before. How can you find out?
-There's a convenient command that shows you all the places your HEAD did point to in the past:
+There's a convenient command that shows you all the places your HEAD has pointed to in the past:
git reflog