mirror of
https://github.com/git-learning-game/oh-my-git.git
synced 2024-11-11 19:04:50 +01:00
Merge branch 'main' into main
This commit is contained in:
commit
9560254739
5 changed files with 11 additions and 7 deletions
|
@ -37,7 +37,7 @@ You do not have a donut." > you
|
|||
git add .
|
||||
git commit -m "You eat the baguette"
|
||||
|
||||
git checkout -b coffee
|
||||
git checkout -b coffee main
|
||||
echo "You do not have a baguette.
|
||||
|
||||
You have coffee.
|
||||
|
|
|
@ -4,13 +4,11 @@ cards = checkout commit-auto merge reset-hard
|
|||
[description]
|
||||
|
||||
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>
|
||||
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!
|
||||
|
||||
Clear you stash stack!
|
||||
|
||||
---
|
||||
tipp1
|
||||
|
@ -38,7 +36,7 @@ git checkout main
|
|||
|
||||
[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
|
||||
|
||||
[actions]
|
||||
|
@ -47,4 +45,4 @@ test "$(git branch --list| wc -l)" -ge 2
|
|||
|
||||
[congrats]
|
||||
|
||||
All clear! :)
|
||||
Stashed changes are in a new branch! :)
|
||||
|
|
|
@ -35,6 +35,7 @@ git stash push
|
|||
echo "- Pinch of Salt" >> recipe
|
||||
|
||||
git checkout main
|
||||
git add recipe
|
||||
|
||||
[win]
|
||||
|
||||
|
|
|
@ -96,6 +96,9 @@ func careful_delete(path_inside):
|
|||
expected_prefix = "/Users/%s/Library/Application Support/Oh My Git/tmp/" % OS.get_environment("USER")
|
||||
elif os == "Windows":
|
||||
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:
|
||||
helpers.crash("Unsupported OS: %s" % os)
|
||||
|
||||
|
|
|
@ -13,4 +13,6 @@
|
|||
[receive]
|
||||
denyCurrentBranch = ignore
|
||||
[commit]
|
||||
gpgsign = false
|
||||
gpgsign = false
|
||||
[pull]
|
||||
rebase = false
|
Loading…
Reference in a new issue