34
edits
Workshops/Git Workshop: Difference between revisions
From London Hackspace Wiki
→Topics (draft): More structure
(→Topics (draft): More structure) |
|||
| Line 1: | Line 1: | ||
== | == Programme (draft)== | ||
=== Guided tour === | |||
We'll cover the following topics, in a 'follow along on your own laptop' style. By the end of this you'll have a good grounding in everyday Git usage. | |||
* Git is a 'stupid content tracker' | * Git is a 'stupid content tracker' | ||
** Why track content? | ** Why track content? | ||
| Line 10: | Line 15: | ||
** What's going on? git status and git diff | ** What's going on? git status and git diff | ||
** What has been going on? git log and git show | ** What has been going on? git log and git show | ||
* Branches | * Branches | ||
** Why branch? | ** Why branch? | ||
| Line 21: | Line 25: | ||
** Getting new commits from a remote | ** Getting new commits from a remote | ||
** Sending your commits to a remote | ** Sending your commits to a remote | ||
* Miscellaneous/ | * Getting help (how to read the man pages without going crazy; terminology; other resources) | ||
=== Tips and Tricks Grab-bag === | |||
Miscellaneous or advanced Git topics. Probably more freestyle. For now, there are in no particular order: | |||
* Common/recommended Git workflows | |||
* Ignoring files | |||
* Using and abusing the staging area (including stashing) | |||
* Rewriting history (git rebase and friends) | |||
* Finding out where things went wrong: git blame and git bisect | |||
* The reflog | |||
* Tags | |||
== Suggestions == | == Suggestions == | ||
