2020-10-27 11:55:47 +01:00
|
|
|
[
|
2020-10-29 15:55:10 +01:00
|
|
|
{
|
|
|
|
"id": "init",
|
|
|
|
"command": "git init",
|
|
|
|
"description": "Initialize the time machine!"
|
|
|
|
},
|
2020-10-27 11:55:47 +01:00
|
|
|
{
|
|
|
|
"id": "checkout",
|
2020-11-03 12:39:40 +01:00
|
|
|
"command": "git checkout [commit, ref]",
|
2020-10-29 15:55:10 +01:00
|
|
|
"description": "Drag this card to a commit or to a branch to travel to it!"
|
2020-10-27 11:55:47 +01:00
|
|
|
},
|
|
|
|
{
|
|
|
|
"id": "commit-auto",
|
|
|
|
"command": "git add .; git commit",
|
2020-11-10 23:17:48 +01:00
|
|
|
"description": "Make a new commit containing your current environment!\nYou'll be asked to enter a short description of what you changed."
|
2020-10-27 11:55:47 +01:00
|
|
|
},
|
|
|
|
{
|
|
|
|
"id": "merge",
|
2020-11-03 12:39:40 +01:00
|
|
|
"command": "git merge [commit]",
|
2020-10-29 20:02:43 +01:00
|
|
|
"description": "Merge the specified timeline into yours. If necessary, will create a merge commit."
|
2020-10-27 11:55:47 +01:00
|
|
|
},
|
|
|
|
{
|
|
|
|
"id": "rebase",
|
2020-11-03 12:39:40 +01:00
|
|
|
"command": "git rebase [commit]",
|
2020-10-27 11:55:47 +01:00
|
|
|
"description": "Put the events in your current timeline on top of the specified one."
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"id": "pull",
|
|
|
|
"command": "git pull",
|
|
|
|
"description": "Get timelines from a colleague."
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"id": "push",
|
|
|
|
"command": "git push",
|
|
|
|
"description": "Give timelines to a colleague."
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"id": "rebase-interactive",
|
2020-11-03 12:39:40 +01:00
|
|
|
"command": "git rebase -i [commit]",
|
2020-10-27 11:55:47 +01:00
|
|
|
"description": "Make changes to the events in your current timeline, back to the commit you drag this to."
|
|
|
|
},
|
2020-11-09 20:45:39 +01:00
|
|
|
{
|
|
|
|
"id": "rebase-continue",
|
|
|
|
"command": "git rebase --continue",
|
|
|
|
"description": "Continue the current rebasing process."
|
|
|
|
},
|
2020-10-27 11:55:47 +01:00
|
|
|
{
|
|
|
|
"id": "reset-hard",
|
2020-11-03 12:39:40 +01:00
|
|
|
"command": "git reset --hard [commit]",
|
2020-10-29 15:55:10 +01:00
|
|
|
"description": "Move the branch you're on to the specified commit."
|
2020-10-27 11:55:47 +01:00
|
|
|
},
|
2020-11-09 20:45:39 +01:00
|
|
|
{
|
|
|
|
"id": "reset",
|
|
|
|
"command": "git reset [commit]",
|
|
|
|
"description": "Jump to the commit, and update the index. Keep the current environment."
|
|
|
|
},
|
2020-10-27 11:55:47 +01:00
|
|
|
{
|
|
|
|
"id": "cherry-pick",
|
2020-11-03 12:39:40 +01:00
|
|
|
"command": "git cherry-pick [commit]",
|
2020-10-27 11:55:47 +01:00
|
|
|
"description": "Repeat the specified action on top of your current timeline."
|
2020-10-30 12:08:17 +01:00
|
|
|
},
|
|
|
|
{
|
|
|
|
"id": "bisect-start",
|
|
|
|
"command": "git bisect start",
|
|
|
|
"description": "Start looking for the commit where things got bad."
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"id": "bisect-good",
|
|
|
|
"command": "git bisect good",
|
|
|
|
"description": "State that the current commit is good! When you're automatically transferred, keep playing the `good` and `bad` cards!"
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"id": "bisect-bad",
|
|
|
|
"command": "git bisect bad",
|
|
|
|
"description": "State that the current commit is bad! When you're automatically transferred, keep playing the `good` and `bad` cards!"
|
2020-11-07 13:59:47 +01:00
|
|
|
},
|
|
|
|
{
|
|
|
|
"id": "add",
|
|
|
|
"command": "git add [file]",
|
2020-11-09 20:45:39 +01:00
|
|
|
"description": "Put the current status of the file into the plan."
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"id": "commit",
|
|
|
|
"command": "git commit",
|
|
|
|
"description": "Make a commit from the plan."
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"id": "show",
|
|
|
|
"command": "git show [commit]",
|
|
|
|
"description": "Show what changed in the commit."
|
2020-11-10 22:20:40 +01:00
|
|
|
},
|
|
|
|
{
|
|
|
|
"id": "branch",
|
|
|
|
"command": "git branch [string]",
|
|
|
|
"description": "Create a new branch."
|
|
|
|
},
|
2020-11-13 12:27:15 +01:00
|
|
|
{
|
|
|
|
"id": "branch-delete",
|
|
|
|
"command": "git branch -D [ref]",
|
|
|
|
"description": "Delete a branch."
|
|
|
|
},
|
2020-11-10 22:20:40 +01:00
|
|
|
{
|
|
|
|
"id": "file-new",
|
|
|
|
"command": "touch [string]",
|
|
|
|
"description": "Create a new file."
|
2020-11-13 11:21:36 +01:00
|
|
|
},
|
|
|
|
{
|
|
|
|
"id": "file-delete",
|
|
|
|
"command": "rm [file]",
|
|
|
|
"description": "Delete a new file."
|
2020-11-13 11:36:05 +01:00
|
|
|
},
|
|
|
|
{
|
|
|
|
"id": "file-rename",
|
|
|
|
"command": "mv [file] [string]",
|
|
|
|
"description": "Rename a new file."
|
2020-10-27 11:55:47 +01:00
|
|
|
}
|
|
|
|
]
|