Backupppert/oh-my-git
1
0
Fork 0
mirror of https://github.com/git-learning-game/oh-my-git.git synced 2024-11-20 16:20:18 +01:00
Code Issues Projects Releases Packages Wiki Activity
448 commits 4 branches 22 tags 47 MiB
Commit graph

133 commits

Author SHA1 Message Date
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
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
blinry
41aba7d9cc Make win condition in level about adding files case-insensitive 
Fixes #43.
 2021-03-08 14:51:07 +01:00
Florian Klumb
afef5aa5b6 Fix baguette and coffee mixup in Ch. Rebase 2021-03-04 10:07:35 +01:00
blinry
2250b9b473 Polish some levels in the first chapters, and the branch-delete icon 2021-02-19 11:52:24 +01:00
blinry
c2edf9a91d Clarify lion level 2021-02-18 17:38:47 +01:00
blinry
5e68451a43 Simplify first remote level 2021-02-18 17:30:11 +01:00
blinry
21f55fd705 Insert a level in the intro that forces players to use the command line 2021-02-18 16:04:14 +01:00
blinry
7ecc55a3fb Add cli hints to the first three levels 2021-02-18 12:39:33 +01:00
Federico Grau
9f1444d4c3 Make clear where blue index aura is visible 
Minor wording change to make clear the blue index aura will be visible
in the file browser (and not in the tree area).
 2021-02-13 17:21:01 -05:00
bleeptrack
c50d012e00 less commits in bisect level 2021-02-11 11:32:55 +01:00
bleeptrack
0781649227 grey cli hints in level description 2021-02-11 11:19:22 +01:00
blinry
0ffa82b58d
Merge pull request #17 from bziemons/patch-1 
Fix typo in intro/risky level
 2021-02-09 07:03:39 -08:00
bleeptrack
bd5f8b33f3 improving interior design level 2021-02-09 15:50:14 +01:00
bleeptrack
ab829acf91 rm file level is now a spider web level 2021-02-09 15:17:48 +01:00
Benedikt Ziemons
c7f8b3cd09
Fix typo in intro/risky level 
from.txt -> form.txt
 2021-02-07 23:54:15 +01:00
blinry
d5a7c2eb9e Bring level sequence up to date 2021-02-07 10:59:24 +01:00
blinry
7d8c05e78b Clarify what to do in the first remote level a bit more 2021-02-06 14:42:43 +01:00
blinry
746dc24bfb Correct a level link in the README 2021-02-05 20:55:37 +01:00
blinry
a938ba206f Try on another name: Oh My Git! 2021-02-05 15:00:13 +01:00
blinry
13dc516edf Add sandbox button to the title, and add CLI badge explainer 2021-02-04 15:19:54 +01:00
blinry
cab8a9837c Polishing the intro chapter 2021-02-04 13:59:13 +01:00
blinry
a86fcaadbb More polish for the index level 2021-02-04 12:02:15 +01:00
blinry
09bbf7a0ad First storification of the index chapter 2021-02-02 16:46:32 +01:00
blinry
0471c92158 Clarify the hobbies.txt goal 2021-01-14 14:06:39 +01:00
bleeptrack
8de8494677 Merge remote-tracking branch 'origin/main' into main 2021-01-14 11:44:50 +01:00
bleeptrack
d80db31d19 moving file mv level to unused 2021-01-14 11:44:47 +01:00
bleeptrack
4a754cfe4e adding "turquoise" as valid win condition instead of green + blue 2021-01-14 11:44:23 +01:00
bleeptrack
34b348c8f9 Adding win descriptions 2021-01-14 11:43:45 +01:00
bleeptrack
c52c742b2d bisect: level description clarification 2021-01-14 11:43:26 +01:00
blinry
b6300c16d9 Remote fetch from sequence 2021-01-14 11:38:47 +01:00
blinry
7da24b32e7 Remove the fetch level for now 2021-01-14 11:30:58 +01:00
blinry
97a7c40ba3 Symbols for index-modifying cards, remove index/mv level for now 
Plus better descriptions for pull/push/fetch.
 2021-01-14 11:26:21 +01:00
blinry
5df4932ad5 More polish, hide unfinished chapters/levels 2021-01-13 17:30:32 +01:00
blinry
be45b82e41 Polish branches chapter 2021-01-13 16:27:18 +01:00
blinry
cccaa75a48 Also allow uppercase X when filling out form in the intro level 2021-01-12 12:51:21 +01:00
blinry
8d333ce56a Work on the intro and the index chapter 2021-01-11 19:16:35 +01:00