-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Git Workflow Course
Workflow Course Overview
Below you can find the ordered content of the topic, in a linear progression
The linear progression of content aims to cover all content, course by course, workout by workout as follows:
- first course is the only core one, denoted by its manifest
- the next course is denoted by the first item of the next array in each course manifest
- each course has its order of workouts designated by the sections field in the same aforementioned manifest
1. workflow
Insights:
no | name | content | aspects | standards | PQ | RQ | Quiz | done |
---|---|---|---|---|---|---|---|---|
1 | workflow-long-running-branches | ✅ | ❌ | ❌ | ❌ | ✅ | ❌ | ❌ |
2 | workflow-topic-branches | ✅ | ❌ | ❌ | ✅ | ✅ | ❌ | ❌ |
3 | squashing-commits | ✅ | ❌ | ❌ | ❌ | ✅ | ❌ | ❌ |
4 | git-hub | ✅ | ❌ | ❌ | ❌ | ✅ | ❌ | ❌ |
5 | general-github-workflow | ✅ | ❌ | ❌ | ❌ | ✅ | ❌ | ❌ |
Exercises:
Game:
2. merges
Insights:
no | name | content | aspects | standards | PQ | RQ | Quiz | done |
---|---|---|---|---|---|---|---|---|
1 | solving-basic-merge-conflicts | ✅ | ❌ | ❌ | ✅ | ✅ | ❌ | ❌ |
2 | merging-under-the-hood | ✅ | ❌ | ❌ | ❌ | ✅ | ❌ | ❌ |
3 | rebasing | ✅ | ❌ | ❌ | ✅ | ✅ | ❌ | ❌ |
4 | the-golden-rule-of-rebasing | ✅ | ❌ | ❌ | ✅ | ✅ | ❌ | ❌ |
5 | remember-the-results-of-previous-hunk-conflicts | ✅ | ❌ | ❌ | ✅ | ✅ | ❌ | ❌ |
Exercises:
Game:
3. help
Insights:
no | name | content | aspects | standards | PQ | RQ | Quiz | done |
---|---|---|---|---|---|---|---|---|
1 | getting-help | ✅ | ❌ | ❌ | ✅ | ✅ | ❌ | ❌ |
2 | modifying-a-previous-commit | ✅ | ❌ | ❌ | ❌ | ✅ | ❌ | ❌ |
3 | how-to-unstage-a-staged-file | ✅ | ❌ | ❌ | ✅ | ✅ | ❌ | ❌ |
4 | undo-a-committed-snapshot | ✅ | ❌ | ❌ | ✅ | ✅ | ❌ | ❌ |
5 | recover-lost-code | ✅ | ❌ | ❌ | ✅ | ✅ | ❌ | ❌ |
Exercises:
Game:
Insights:
no | name | content | aspects | standards | PQ | RQ | Quiz | done |
---|---|---|---|---|---|---|---|---|
1 | search-by-commit-message-keyword | ✅ | ❌ | ❌ | ✅ | ✅ | ❌ | ❌ |
2 | search-for-commits-by-author | ✅ | ❌ | ❌ | ✅ | ✅ | ❌ | ❌ |
3 | locate-a-commit-by-its-hash | ✅ | ❌ | ❌ | ✅ | ✅ | ❌ | ❌ |
4 | specify-a-commit-by-its-ancestry | ✅ | ❌ | ❌ | ✅ | ✅ | ✅ | ❌ |
5 | specify-a-range-of-commits-using-double-dot-syntax | ✅ | ❌ | ❌ | ✅ | ✅ | ❌ | ❌ |
Exercises:
Game:
5. branches
Insights:
no | name | content | aspects | standards | PQ | RQ | Quiz | done |
---|---|---|---|---|---|---|---|---|
1 | viewing-your-tracking-branches | ✅ | ❌ | ❌ | ✅ | ✅ | ❌ | ❌ |
2 | checkout-the-previous-branch | ✅ | ❌ | ❌ | ❌ | ✅ | ❌ | ❌ |
3 | move-the-last-commit-to-a-new-branch | ✅ | ❌ | ❌ | ✅ | ✅ | ❌ | ❌ |
4 | master-and-origin-aren-t-special | ✅ | ❌ | ❌ | ✅ | ✅ | ❌ | ❌ |
5 | prune-remote-tracking-references | ✅ | ❌ | ❌ | ✅ | ✅ | ❌ | ❌ |
Exercises:
Game:
6. logging
Insights:
no | name | content | aspects | standards | PQ | RQ | Quiz | done |
---|---|---|---|---|---|---|---|---|
1 | logging | ✅ | ❌ | ❌ | ✅ | ✅ | ❌ | ❌ |
2 | limiting-log-output-by-time | ✅ | ❌ | ❌ | ✅ | ✅ | ❌ | ❌ |
3 | make-your-log-output-pretty | ✅ | ❌ | ❌ | ✅ | ✅ | ❌ | ❌ |
4 | show-history-of-a-function | ✅ | ❌ | ❌ | ✅ | ✅ | ❌ | ❌ |
5 | view-your-commit-history-in-a-graph | ✅ | ❌ | ❌ | ❌ | ✅ | ❌ | ❌ |
Exercises:
Game:
7. staging-i
Insights:
no | name | content | aspects | standards | PQ | RQ | Quiz | done |
---|---|---|---|---|---|---|---|---|
1 | intent-to-add | ✅ | ❌ | ❌ | ✅ | ✅ | ❌ | ❌ |
2 | interactive-staging | ✅ | ❌ | ❌ | ✅ | ✅ | ❌ | ❌ |
3 | interactively-stage-patches | ✅ | ❌ | ❌ | ❌ | ✅ | ❌ | ❌ |
4 | interactively-unstage-changes | ✅ | ❌ | ❌ | ✅ | ✅ | ❌ | ❌ |
5 | use-short-status-to-make-output-more-compact | ✅ | ❌ | ❌ | ✅ | ✅ | ❌ | ❌ |
Exercises:
Game:
8. staging-ii
Insights:
no | name | content | aspects | standards | PQ | RQ | Quiz | done |
---|---|---|---|---|---|---|---|---|
1 | untrack-a-directory-file-without-deleting-it | ✅ | ❌ | ❌ | ✅ | ✅ | ❌ | ❌ |
2 | delete-all-untracked-files | ✅ | ❌ | ❌ | ✅ | ✅ | ❌ | ❌ |
3 | create-a-new-branch-from-a-stash | ✅ | ❌ | ❌ | ✅ | ✅ | ❌ | ❌ |
4 | stashing-changes | ✅ | ❌ | ❌ | ✅ | ✅ | ❌ | ❌ |
5 | useful-stashing-options | ✅ | ❌ | ❌ | ✅ | ✅ | ❌ | ❌ |
Exercises:
Game:
9. tips
Insights:
no | name | content | aspects | standards | PQ | RQ | Quiz | done |
---|---|---|---|---|---|---|---|---|
1 | cache-your-authentication-details-to-save-time | ✅ | ❌ | ❌ | ✅ | ✅ | ❌ | ❌ |
2 | sign-your-work-using-gpg | ✅ | ❌ | ❌ | ✅ | ✅ | ❌ | ❌ |
3 | avoiding-whitespace-issues | ✅ | ❌ | ❌ | ✅ | ✅ | ❌ | ❌ |
4 | overcome-line-ending-issues | ✅ | ❌ | ❌ | ✅ | ✅ | ❌ | ❌ |
5 | custom-colour-options | ✅ | ❌ | ❌ | ✅ | ✅ | ❌ | ❌ |
Exercises:
Game:
10. work-smart
Insights:
no | name | content | aspects | standards | PQ | RQ | Quiz | done |
---|---|---|---|---|---|---|---|---|
1 | you-can-use-git-offline | ✅ | ❌ | ❌ | ✅ | ✅ | ❌ | ❌ |
2 | tracking-shorthands | ✅ | ❌ | ❌ | ✅ | ✅ | ❌ | ❌ |
3 | upstream-tracking-shorthand | ✅ | ❌ | ❌ | ✅ | ✅ | ❌ | ❌ |
4 | using-aliases-for-git-commands | ✅ | ❌ | ❌ | ✅ | ✅ | ❌ | ❌ |
5 | add-autocorrect-to-git | ✅ | ❌ | ❌ | ❌ | ✅ | ❌ | ❌ |
Exercises:
Game:
Given the insights are tagged with aspects, we can filter over the linear content progression and create learning sub-paths.
These sub-path progressions will most likely not cover all content, but they will ensure and enforce an unified learning experience, tailor for the user wish.
For example, a user might be interested in new additions and updates of a language, rather than introduction lessions. Note that these sub-paths don't take games into consideration
If you are being introduced to the topic for the first time
Theory put into practice/that’s how you achieve X points
Prerequisite knowledge consisting of 2 or more 👶/💪 workouts
Recently added/gained traction feature
Stories, obscure details that don’t specifically relate to a learning objective
- workflow-long-running-branches
- workflow-topic-branches
- squashing-commits
- git-hub
- general-github-workflow
- solving-basic-merge-conflicts
- merging-under-the-hood
- rebasing
- the-golden-rule-of-rebasing
- remember-the-results-of-previous-hunk-conflicts
- getting-help
- modifying-a-previous-commit
- how-to-unstage-a-staged-file
- undo-a-committed-snapshot
- recover-lost-code
- search-by-commit-message-keyword
- search-for-commits-by-author
- locate-a-commit-by-its-hash
- specify-a-commit-by-its-ancestry
- specify-a-range-of-commits-using-double-dot-syntax
- viewing-your-tracking-branches
- checkout-the-previous-branch
- move-the-last-commit-to-a-new-branch
- master-and-origin-aren-t-special
- prune-remote-tracking-references
- logging
- limiting-log-output-by-time
- make-your-log-output-pretty
- show-history-of-a-function
- view-your-commit-history-in-a-graph
- intent-to-add
- interactive-staging
- interactively-stage-patches
- interactively-unstage-changes
- use-short-status-to-make-output-more-compact
- untrack-a-directory-file-without-deleting-it
- delete-all-untracked-files
- create-a-new-branch-from-a-stash
- stashing-changes
- useful-stashing-options
- cache-your-authentication-details-to-save-time
- sign-your-work-using-gpg
- avoiding-whitespace-issues
- overcome-line-ending-issues
- custom-colour-options
- you-can-use-git-offline
- tracking-shorthands
- upstream-tracking-shorthand
- using-aliases-for-git-commands
- add-autocorrect-to-git
Want to contribute to this wiki? Go right ahead! If it has to do with how the Enki software ecosystem works, or editorial guidelines for how to write, let us handle that. Anything else, edit away!
Curriculum Format:
- Topic Documentation
- Course Documentation
- Workout Documentation
- Insight Documentation
- Glossary Documentation
Contributor Resources:
Curriculum overview:
Topic pages: