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

456 commits

This branch
This branch
All branches
Author SHA1 Message Date
MK-UDUE b64aeef896
Suggesting pushing rather than pulling 
Twice pulling doesn't make sense (to me).
 2021-04-29 19:10:02 +02:00
blinry 1606e0565e
Merge pull request #59 from mundifex/stash-deadlock-fix 
Fix deadlock in stash levels
 2021-04-12 16:48:31 +02: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 ffadebb0df Simplify careful_delete even more by relying on user:// on each OS 
Closes #83.
 2021-04-12 16:03:11 +02:00
blinry 3211cd0481 Use HOME variables in careful_delete 
This helps in cases where the home directory is in unexpected places,
like on external hard drives, and should still be very safe.

Closes #60, closes #81.
 2021-04-12 15:49:20 +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
blinry 3e5c422663
Merge pull request #80 from mundifex/reorder-perl 
Make reorder level winnable on macOS platforms by using perl instead …
 2021-03-30 18:09:53 +02:00
Eugen Blattner cb1c0c2848
fix: typo in level stash 2021-03-29 02:02:41 +02:00
mundifex c2a2f87f4c Fix deadlock in stash levels 
- use vertical tab character instead of "MAGIC" string to denote end of input
- check for terminator using pattern match instead of eq

Users are unable to provide special characters to Bash process so this should
be relatively safe. Pattern match succeeds even when `git stash` omits newline
while rendering commit subjects.

Fixes git-learning-game/oh-my-git#56
 2021-03-26 21:34:22 -05: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 d7870743d6
Merge pull request #63 from kunzaatko/main 
Fix: gpgsign fails the commit
 2021-03-24 15:56:45 +01:00
blinry 9560254739
Merge branch 'main' into main 2021-03-24 15:56:30 +01:00
Martin Kunz 144388aa83
Fix: commit fails when gpgsign = true 
[Fixes: #62]
 2021-03-24 15:44:57 +01:00
blinry b5ca69264a On Windows, compare paths case-insensitively for the purpose of careful_delete 
Fixes #27.
 2021-03-24 15:38:53 +01:00
blinry d44c7d0d49 Explicitly set pull.rebase = false, to avoid the long confusing warning 
Fixes #45.
 2021-03-24 14:55:10 +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
blinry bb21bd7750
Merge pull request #52 from bepstein/main 
Move coffee branch chain to the main branch to fix the uneaten baguette.
 2021-03-24 14:04:38 +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
blinry ec9b467cc6
Merge pull request #47 from ByteHamster/patch-1 
Fixed description text of "remove tags" level
 2021-03-09 18:29:35 +01: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
blinry 087a77527e Run game in fullscreen mode 2021-03-05 14:18:43 +01:00
blinry 5770fa6896 On Windows, wait until connection to bash has been established 2021-03-05 14:17:48 +01:00
blinry e952c97cb6
Merge pull request #42 from florianklumb/fix-ch-rebase-baguette-vs-coffee 
Fix baguette and coffee mixup in Ch. Rebase
 2021-03-04 06:13:35 -08:00
blinry 05b98d7a13 On Windows, use the faster BetterShell 2021-03-04 15:03:05 +01:00
blinry a60b2f9afb Directly run the command in the shell 2021-03-04 15:03:05 +01:00
blinry 16edb843b7 Add a mutex and fix the length in the net-test script 2021-03-04 15:03:05 +01:00
blinry 1b7bb246d1 Fixes for the new shell mechanism on Windows 2021-03-04 15:03:05 +01:00
blinry 53c249d059 Start working on a better shell mechanism for Windows 
It uses a Perl script to keep a bash session open, which attaches to a
port the game keeps open. This avoids having to start a new Git bash for
each command, improving the execution speed by a factor of 3-4.
 2021-03-04 15:03:05 +01:00
Florian Klumb afef5aa5b6 Fix baguette and coffee mixup in Ch. Rebase 2021-03-04 10:07:35 +01:00
bleeptrack 2a82b617be
remove header in readme 2021-03-01 11:14:34 +01:00
bleeptrack 79932e0f59
cli hints in readme 2021-03-01 11:12:58 +01:00
bleeptrack 45742eef3a
Update Readme 2021-03-01 10:44:08 +01:00
blinry 3a42869653 Keep user's PATH, but extend it with our script directory 
Fixes #11.
 2021-02-19 11:52:24 +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 f7351316bc Add a glow effect to cards that have never been played 2021-02-18 18:06:17 +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 8986900c3d Turn down harsh sounds a bit 2021-02-18 17:30:11 +01:00