Backupppert/oh-my-git
1
0
Fork 0
mirror of https://github.com/git-learning-game/oh-my-git.git synced 2025-05-05 05:02:02 +02:00
Code Issues Projects Releases Packages Wiki Activity

Work on the intro and the index chapter

Browse source
This commit is contained in:
blinry 2021-01-11 19:16:35 +01:00
parent 4910e4d566
commit 8d333ce56a
31 changed files with 327 additions and 185 deletions
levels/index
reset

18
levels/index/reset
View file

@ -1,9 +1,11 @@
title = Resetting files in the index
cards = add reset
cards = add reset commit
[description]
If you already have changes in the index, but want to reset them, you can use `git reset`!
See the dark shadow behind the icons? That's the version of the commit you're at!
If you already have updated the index to a changed file, but want to reset it, you can use `git reset`!
[setup]
@ -14,9 +16,17 @@ git add .
git commit -m "Initial commit"
echo x > a
echo x > b
echo x > c
git add .
[win]
# Reset all changes in files in the index!
test "$(git diff --cached --name-only | wc -l)" -eq 0
# Reset the changes in a and c
test "$(git show :a)" == "a" &&
test "$(git show :b)" != "a" &&
test "$(git show :c)" == "c"
# And make a commit!
test "$(git show main:a)" == "a" &&
test "$(git show main:b)" != "b" &&
test "$(git show main:c)" == "c"