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

Polish branches chapter

Browse source
This commit is contained in:
blinry 2021-01-13 16:26:48 +01:00
parent 80c50bdc81
commit be45b82e41
18 changed files with 231 additions and 191 deletions
resources
cards.json

9
resources/cards.json
View file

@ -46,9 +46,14 @@
},
{
"id": "merge",
"command": "git merge [commit]",
"command": "git merge [commit, ref]",
"description": "Merge the specified timeline into yours. If necessary, will create a merge commit."
},
{
"id": "merge-abort",
"command": "git merge --abort",
"description": "Abort the current merge attempt, and reconstruct the previous state."
},
{
"id": "rebase",
"command": "git rebase [commit]",
@ -137,7 +142,7 @@
{
"id": "branch",
"command": "git branch [string]",
"description": "Create a new branch."
"description": "Create a new branch at your current location."
},
{
"id": "branch-delete",