mirror of
https://github.com/git-learning-game/oh-my-git.git
synced 2025-05-07 05:02:04 +02:00
stashing
This commit is contained in:
parent
82b8e8f458
commit
9109394271
7 changed files with 257 additions and 0 deletions
levels/stash
50
levels/stash/stash-branch
Normal file
50
levels/stash/stash-branch
Normal file
|
@ -0,0 +1,50 @@
|
|||
title = Branch from stash
|
||||
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
|
||||
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
|
||||
---
|
||||
tipp2
|
||||
---
|
||||
tipp3
|
||||
|
||||
[setup]
|
||||
|
||||
echo "Apple Pie:" > recipe
|
||||
|
||||
git add .
|
||||
git commit -m "creating a recipe"
|
||||
|
||||
echo "- 4 Apples" >> recipe
|
||||
|
||||
git add .
|
||||
git commit -m "Adding ingredients"
|
||||
|
||||
echo "- 500g Flour" >> recipe
|
||||
git stash push
|
||||
|
||||
git checkout main
|
||||
|
||||
[win]
|
||||
|
||||
# Did you clear your stash stack?
|
||||
test "$(git branch --list| wc -l)" -ge 2
|
||||
|
||||
[actions]
|
||||
|
||||
|
||||
|
||||
[congrats]
|
||||
|
||||
All clear! :)
|
Loading…
Add table
Add a link
Reference in a new issue