aleoncavallo
a301a1ce13
Merge 97990b1a73 into c64e8f276a
2025-03-25 17:38:55 +01:00
Charles Haines
290798d774
Fix spelling error in level stash-merge
2025-03-24 12:06:16 -04:00
Pablo Dobry
7f2fa3039f
Fix control in [win] seccion on checkout-commit
2025-03-24 12:05:45 -04:00
wyattscarpenter
1a8fe69f7a
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.
2024-08-22 01:28:06 -07:00
Andrea Leon Cavallo
97990b1a73
agrego los numerales
2024-06-05 00:42:45 -03:00
Andrea Leon Cavallo
292a34c8bb
Merge branch 'intro-levels-translation' of github.com:aleoncavallo/oh-my-git-es into intro-levels-translation
2024-06-05 00:38:28 -03:00
Andrea Leon Cavallo
675e3bfe5a
elimino card al final de commit
2024-06-05 00:37:41 -03:00
Ana Murinigo
579d58dccd
Adding more # remote
2024-06-05 00:28:12 -03:00
Ana Murinigo
cae2296e5f
Adding # remote
2024-06-05 00:26:09 -03:00
Ana Murinigo
9e20ecc55b
Adding # in win init
2024-06-05 00:19:37 -03:00
Ana Murinigo
3371fbe331
Deleting enter commit
2024-06-05 00:16:46 -03:00
Ana Murinigo
f7c08c1027
Update remote
2024-06-04 00:30:05 -03:00
Ana Murinigo
e2dfb8991c
Fixing minor bugs and deleting duplicated code commit
2024-06-04 00:26:11 -03:00
Ana Murinigo
d9c1ea2895
Deleting duplicate parragraph commit
2024-06-04 00:19:01 -03:00
Ana Murinigo
8391983ae2
Translate who-are-you
2024-06-03 23:23:34 -03:00
Ana Murinigo
e1bdd6a2ae
Translate risky
2024-06-03 23:22:12 -03:00
Ana Murinigo
e95a3e0023
Translate remote
2024-06-03 23:21:01 -03:00
Ana Murinigo
424f5e0429
Translate cli
2024-06-03 23:18:40 -03:00
Ana Murinigo
6b28416d15
Translate commit
2024-06-03 23:17:13 -03:00
Ana Murinigo
b780fe7bc1
Translate init
2024-06-03 23:10:26 -03:00
Ana Murinigo
de464442aa
Translate copies
2024-06-03 23:09:44 -03:00
Marcel Ribeiro-Dantas
9da0bd1fbd
Fix typos
2024-02-13 15:20:04 +01:00
blinry
853b8e2d53
Merge pull request #144 from n4mr3g/patch-1
...
Added info of the 'friend' repo, that the player needs to clone, in the level description.
2022-07-19 14:50:16 +02:00
Germán Piccioni
d67e5056ea
Added in the description the location of the repo to clone.
2022-06-20 01:33:30 +02:00
Elatronion
0ea34e6bd9
fix typo in bisect level Yellow brick road
...
`"bisect good card"` has been changed to `"bisect good" card` to be more accurate and consistent with `"bisect start" card` and `"bisect bad" card`.
2022-02-16 21:38:05 -05:00
blinry
929c634cc4
Merge pull request #111 from MK-UDUE/patch-3
...
Fixed small typo "named" instead of "names"
2021-05-10 12:16:48 +02:00
blinry
b9dff307b2
Merge pull request #110 from MK-UDUE/patch-2
...
Suggesting pushing rather than pulling
2021-05-10 12:16:02 +02:00
blinry
2bb5d4c4b3
Merge pull request #96 from artt/patch-1
...
Fixed typo in files > add level
2021-05-10 12:15:00 +02:00
MK-UDUE
c117503375
Fixed small typo "named" instead of "names"
2021-04-29 19:15:48 +02:00
MK-UDUE
b64aeef896
Suggesting pushing rather than pulling
...
Twice pulling doesn't make sense (to me).
2021-04-29 19:10:02 +02:00
Art Tosborvorn
6a7c1eab6f
Update files-add
...
Fixed it's -> its typo.
2021-04-15 09:10:51 +07:00
Tokugero
f9123b5652
Sample of making this level more clear.
...
It wasn't at all clear how to solve this until I came to look at the actual tests. The first win condition step also didn't display which may have been a result of the format? Here's an example of something that might be more clear to the player.
2021-04-13 12:42:51 -07:00
blinry
b8a18c4c2e
Merge pull request #88 from RedXanadu/main
...
Corrected spelling mistake
2021-04-12 16:40:11 +02:00
blinry
e8b8583f49
Simplify the win condition for the remotes/problems level
...
Basically, the level now accepts every compromise, and just looks at the
shape of the commit graph.
Closes #87 .
2021-04-12 16:23:59 +02:00
blinry
2b3903a599
Clarify instructions for the "Moving branches around" level
...
Closes #77 .
2021-04-12 15:22:02 +02:00
blinry
74b59cff0a
Double-check that players solved the "merging timelines" level correctly
...
Fixes #75 .
2021-04-12 15:14:32 +02:00
Xanadu
7df6b60fa3
Corrected spelling mistake
2021-04-04 19:09:26 +01:00
blinry
44666d59ef
Merge pull request #82 from blanorama/patch-1
...
fix: typo in level stash
2021-03-30 18:10:58 +02:00
Eugen Blattner
cb1c0c2848
fix: typo in level stash
2021-03-29 02:02:41 +02:00
Ben Donatelli
5b12679988
Make reorder level winnable on macOS platforms by using perl instead of grep
...
macOS provides BSD grep which does not support -P flag. Perl pattern match
works on all platforms.
Fixes git-learning-game/oh-my-git#79
2021-03-26 20:38:15 -05:00
blinry
f8f562b742
Merge pull request #53 from mundifex/main
...
Force grep command to use UTF-8 locale in solution for 'reorder' level
2021-03-25 07:06:27 +01:00
blinry
9b7cc5de02
Merge pull request #64 from kunzaatko/patch-1
...
Fix: typo
2021-03-24 14:21:15 +01:00
blinry
1ca3e9d208
Merge pull request #58 from mundifex/simplify-stash-merge
...
Simplify solution for level 'stash-merge' by adding recipe to index
2021-03-24 14:11:33 +01:00
blinry
6ff58f7354
Merge pull request #54 from mtreinik/main
...
Fix goal and congrats messages
2021-03-24 14:11:04 +01:00
Martin Kunz
c979939905
Fix: typo
2021-03-20 17:32:15 +01:00
Ben Donatelli
fd1a770a94
Simplify solution for level 'stash-merge' by adding recipe to index
...
If recipe isn't part of index, user receives an error warning that local changes to file would be overwritten by merge when executing `git stash pop`. Since the focus of this lesson is learning about popping the stash, starting with recipe already added to index neatly sidesteps this error.
2021-03-11 20:53:13 -06:00
Mikko Reinikainen
d9b6165aa8
Fix goal and congrats messages
2021-03-10 08:17:26 +02:00
Ben Donatelli
b99510dea7
Force grep command to use UTF-8 locale in solution for 'reorder' level
2021-03-09 22:14:48 -06:00
Brian Epstein
5380212c88
Move coffee branch chain to the main branch to fix the uneaten baguette.
2021-03-09 17:12:54 -05:00
ByteHamster
432206ebfe
Fixed description text of "remove tags" level
2021-03-09 17:15:54 +01:00
