Backupppert/oh-my-git
1
0
Fork 0
mirror of https://github.com/git-learning-game/oh-my-git.git synced 2024-06-29 07:43:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into main

Browse source
This commit is contained in:
blinry 2021-03-24 15:56:30 +01:00 committed by GitHub
parent 144388aa83 b5ca69264a
commit 9560254739
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
levels/changing-the-past/rebase
View file

@ -37,7 +37,7 @@ You do not have a donut." > you
git add . git add .
git commit -m "You eat the baguette" git commit -m "You eat the baguette"
git checkout -b coffee git checkout -b coffee main
echo "You do not have a baguette. echo "You do not have a baguette.
You have coffee. You have coffee.

8
levels/stash/stash-branch
View file

@ -4,14 +4,12 @@ cards = checkout commit-auto merge reset-hard
[description] [description]
If you want to keep your changes but they don't belong to the main branch, you can easily If you want to keep your changes but they don't belong to the main branch, you can easily
create a new branch from your stashed shanges. Just use create a new branch from your stashed changes. Just use
git stash branch <branchname> <stash> git stash branch <branchname> <stash>
If you just want to use the latest stash entry, you can leave the <stash> option empty. If you just want to use the latest stash entry, you can leave the <stash> option empty.
Create a new branch from the stashed changes! Create a new branch from the stashed changes!
Clear you stash stack!
--- ---
tipp1 tipp1
--- ---
@ -38,7 +36,7 @@ git checkout main
[win] [win]
# Did you clear your stash stack? # Did you create a new branch from the stashed changes?
test "$(git branch --list| wc -l)" -ge 2 test "$(git branch --list| wc -l)" -ge 2
[actions] [actions]
@ -47,4 +45,4 @@ test "$(git branch --list| wc -l)" -ge 2
[congrats] [congrats]
All clear! :) Stashed changes are in a new branch! :)

1
levels/stash/stash-merge
View file

@ -35,6 +35,7 @@ git stash push
echo "- Pinch of Salt" >> recipe echo "- Pinch of Salt" >> recipe
git checkout main git checkout main
git add recipe
[win] [win]

3
scenes/helpers.gd
View file

@ -96,6 +96,9 @@ func careful_delete(path_inside):
expected_prefix = "/Users/%s/Library/Application Support/Oh My Git/tmp/" % OS.get_environment("USER") expected_prefix = "/Users/%s/Library/Application Support/Oh My Git/tmp/" % OS.get_environment("USER")
elif os == "Windows": elif os == "Windows":
expected_prefix = "C:/Users/%s/AppData/Roaming/Oh My Git/tmp/" % OS.get_environment("USERNAME") expected_prefix = "C:/Users/%s/AppData/Roaming/Oh My Git/tmp/" % OS.get_environment("USERNAME")
# Windows treats paths case-insensitively:
expected_prefix = expected_prefix.to_lower()
path_inside = path_inside.to_lower()
else: else:
helpers.crash("Unsupported OS: %s" % os) helpers.crash("Unsupported OS: %s" % os)

2
scripts/gitconfig
View file

@ -14,3 +14,5 @@
denyCurrentBranch = ignore denyCurrentBranch = ignore
[commit] [commit]
gpgsign = false gpgsign = false
[pull]
rebase = false