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

Symbols for index-modifying cards, remove index/mv level for now

Browse source 
Plus better descriptions for pull/push/fetch.
This commit is contained in:
blinry 2021-01-14 11:26:21 +01:00
parent 5df4932ad5
commit 97a7c40ba3
15 changed files with 728 additions and 18 deletions
resources
cards.json

19
resources/cards.json
View file

@ -62,17 +62,17 @@
{
"id": "pull",
"command": "git pull",
"description": "Get timelines from a friend."
"description": "Get a friend's version of the current timeline, and try to merge it into yours."
},
{
"id": "fetch",
"command": "git fetch [remote]",
"description": "Get timelines from a friend."
"description": "Get a friend's version of the current timeline."
},
{
"id": "push",
"command": "git push",
"description": "Give timelines to a friend."
"description": "Give the current timeline to a friend."
},
{
"id": "rebase-interactive",
@ -91,8 +91,13 @@
},
{
"id": "reset",
"command": "git reset [commit, file]",
"description": "Jump to the commit, and update the index. Keep the current environment.\n\nAlternatively, reset changes in a file in the index."
"command": "git reset [commit]",
"description": "Jump to the commit, and update the index. Keep the current environment."
},
{
"id": "reset-file",
"command": "git reset [file]",
"description": "Reset the index "
},
{
"id": "cherry-pick",
@ -122,7 +127,7 @@
{
"id": "add",
"command": "git add [file]",
"description": "Put the current status of the file into the plan."
"description": "Update the index version of the file to its current real content."
},
{
"id": "rm",
@ -137,7 +142,7 @@
{
"id": "commit",
"command": "git commit",
"description": "Make a commit from the plan."
"description": "Make a commit from the current index."
},
{
"id": "show",