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

440 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
bleeptrack 5c69308451 Merge remote-tracking branch 'origin/main' into main 2021-02-18 16:47:42 +01:00
bleeptrack bf052dec3b icons in cards 2021-02-18 16:47:39 +01:00
blinry 94462e9123 Show the current state of the badge in a level, instead of the future one 2021-02-18 16:44:04 +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
bleeptrack 63f093189b magic number for rescaling fix 2021-02-18 15:45:39 +01:00
blinry 7ecc55a3fb Add cli hints to the first three levels 2021-02-18 12:39:33 +01:00
bleeptrack 437cbb7a37 new card images 2021-02-18 12:37:06 +01:00
blinry cba3a0db30 Update logo 2021-02-17 20:57:43 +01:00
blinry 9d8c8e2b83 Add the no_git scene 2021-02-16 11:14:20 +01:00
blinry 0121808dd3
Merge pull request #19 from donfede/main 
Make clear where blue index aura is visible
 2021-02-16 02:09:30 -08: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
blinry 8c6462d0b1 Make hint popups non-focusable, so they don't remove focus from the terminal 2021-02-11 12:03:17 +01:00
blinry 2fc78f3e99 Display a nice error screen if Git is not installed 2021-02-11 11:54:48 +01:00
blinry 5b590b8367 If someone tries to run an editor, use our fake-editor instead 2021-02-11 11:54:48 +01:00
bleeptrack ed7de720a9 new monster is now on cards 2021-02-11 11:53:07 +01:00
bleeptrack c50d012e00 less commits in bisect level 2021-02-11 11:32:55 +01:00