Git Workflow Course

Workflow Course Overview

Table of Contents

• Content
• Aspects
  • 👶 Introduction
  • 💪 Workout
  • 🦑 Deep
  • ✨ New
  • 🔮 Obscura

Content

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	✅	👶 introduction 🦑 deep	❌	❌	✅	❌	❌
2	workflow-topic-branches	✅	👶 introduction	❌	✅	✅	❌	❌
3	squashing-commits	✅	🦑 deep 💪 workout	❌	❌	✅	❌	❌
4	git-hub	✅	🔮 obscura	❌	✅	✅	❌	❌
5	general-github-workflow	✅	🔮 obscura	❌	❌	✅	❌	❌

Exercises:

⚠️ There are no insights in this workout.

Game:

⚠️ There is no game in this workout.

2. merges

Insights:

no	name	content	aspects	standards	PQ	RQ	Quiz	done
1	solving-basic-merge-conflicts	✅	👶 introduction 💪 workout	❌	✅	✅	❌	❌
2	merging-under-the-hood	✅	💪 workout 🦑 deep	❌	❌	✅	❌	❌
3	rebasing	✅	💪 workout 🦑 deep	❌	✅	✅	❌	❌
4	the-golden-rule-of-rebasing	✅	✨ new 💪 workout 🦑 deep	❌	✅	✅	❌	❌
5	remember-the-results-of-previous-hunk-conflicts	✅	💪 workout 🦑 deep 🔮 obscura	❌	✅	✅	❌	❌

Exercises:

⚠️ There are no insights in this workout.

Game:

⚠️ There is no game in this workout.

3. help

Insights:

no	name	content	aspects	standards	PQ	RQ	Quiz	done
1	getting-help	✅	👶 introduction 💪 workout 🔮 obscura	❌	✅	✅	❌	❌
2	modifying-a-previous-commit	✅	🦑 deep 🔮 obscura	❌	❌	✅	❌	❌
3	how-to-unstage-a-staged-file	✅	💪 workout 🦑 deep	❌	✅	✅	❌	❌
4	undo-a-committed-snapshot	✅	👶 introduction 💪 workout	❌	✅	✅	❌	❌
5	recover-lost-code	✅	💪 workout 🦑 deep	❌	✅	✅	❌	❌

Exercises:

⚠️ There are no insights in this workout.

Game:

⚠️ There is no game in this workout.

4. finding-commits

Insights:

no	name	content	aspects	standards	PQ	RQ	Quiz	done
1	search-by-commit-message-keyword	✅	👶 introduction 💪 workout	❌	✅	✅	❌	❌
2	search-for-commits-by-author	✅	👶 introduction 💪 workout	❌	✅	✅	❌	❌
3	locate-a-commit-by-its-hash	✅	👶 introduction 💪 workout	❌	✅	✅	❌	❌
4	specify-a-commit-by-its-ancestry	✅	💪 workout 🦑 deep	❌	✅	✅	✅	❌
5	specify-a-range-of-commits-using-double-dot-syntax	✅	💪 workout 🦑 deep	❌	✅	✅	❌	❌

Exercises:

⚠️ There are no insights in this workout.

Game:

⚠️ There is no game in this workout.

5. branches

Insights:

no	name	content	aspects	standards	PQ	RQ	Quiz	done
1	viewing-your-tracking-branches	✅	💪 workout 👶 introduction	❌	✅	✅	❌	❌
2	checkout-the-previous-branch	✅	👶 introduction 💪 workout	❌	❌	✅	❌	❌
3	move-the-last-commit-to-a-new-branch	✅	🦑 deep 💪 workout	❌	✅	✅	❌	❌
4	master-and-origin-aren-t-special	✅	💪 workout 🔮 obscura	❌	✅	✅	❌	❌
5	prune-remote-tracking-references	✅	💪 workout 🦑 deep 🔮 obscura	❌	✅	✅	❌	❌

Exercises:

⚠️ There are no insights in this workout.

Game:

⚠️ There is no game in this workout.

6. logging

Insights:

no	name	content	aspects	standards	PQ	RQ	Quiz	done
1	logging	✅	👶 introduction 💪 workout 🦑 deep	❌	✅	✅	❌	❌
2	limiting-log-output-by-time	✅	🦑 deep 💪 workout	❌	✅	✅	❌	❌
3	make-your-log-output-pretty	✅	🦑 deep 💪 workout	❌	✅	✅	❌	❌
4	show-history-of-a-function	✅	💪 workout 🦑 deep	❌	✅	✅	❌	❌
5	view-your-commit-history-in-a-graph	✅	💪 workout 🦑 deep	❌	❌	✅	❌	❌

Exercises:

⚠️ There are no insights in this workout.

Game:

⚠️ There is no game in this workout.

7. staging-i

Insights:

no	name	content	aspects	standards	PQ	RQ	Quiz	done
1	intent-to-add	✅	💪 workout 🦑 deep	❌	✅	✅	❌	❌
2	interactive-staging	✅	💪 workout 🦑 deep	❌	✅	✅	❌	❌
3	interactively-stage-patches	✅	💪 workout 🦑 deep	❌	❌	✅	❌	❌
4	interactively-unstage-changes	✅	💪 workout 🦑 deep	❌	✅	✅	❌	❌
5	use-short-status-to-make-output-more-compact	✅	💪 workout 🦑 deep	❌	✅	✅	❌	❌

Exercises:

⚠️ There are no insights in this workout.

Game:

⚠️ There is no game in this workout.

8. staging-ii

Insights:

no	name	content	aspects	standards	PQ	RQ	Quiz	done
1	untrack-a-directory-file-without-deleting-it	✅	👶 introduction 💪 workout	❌	✅	✅	❌	❌
2	delete-all-untracked-files	✅	💪 workout 🦑 deep	❌	✅	✅	❌	❌
3	create-a-new-branch-from-a-stash	✅	💪 workout 🦑 deep	❌	✅	✅	❌	❌
4	stashing-changes	✅	💪 workout 🦑 deep	❌	✅	✅	❌	❌
5	useful-stashing-options	✅	💪 workout 🦑 deep 🔮 obscura	❌	✅	✅	❌	❌

Exercises:

⚠️ There are no insights in this workout.

Game:

⚠️ There is no game in this workout.

9. tips

Insights:

no	name	content	aspects	standards	PQ	RQ	Quiz	done
1	cache-your-authentication-details-to-save-time	✅	🦑 deep 💪 workout 🔮 obscura	❌	✅	✅	❌	❌
2	sign-your-work-using-gpg	✅	💪 workout 🦑 deep 🔮 obscura	❌	✅	✅	❌	❌
3	avoiding-whitespace-issues	✅	💪 workout 🔮 obscura	❌	✅	✅	❌	❌
4	overcome-line-ending-issues	✅	💪 workout 🔮 obscura	❌	✅	✅	❌	❌
5	custom-colour-options	✅	🦑 deep 💪 workout	❌	✅	✅	❌	❌

Exercises:

⚠️ There are no insights in this workout.

Game:

⚠️ There is no game in this workout.

10. work-smart

Insights:

no	name	content	aspects	standards	PQ	RQ	Quiz	done
1	you-can-use-git-offline	✅	👶 introduction 🦑 deep 🔮 obscura	❌	✅	✅	❌	❌
2	tracking-shorthands	✅	💪 workout 🦑 deep 🔮 obscura	❌	✅	✅	❌	❌
3	upstream-tracking-shorthand	✅	💪 workout 🦑 deep	❌	✅	✅	❌	❌
4	using-aliases-for-git-commands	✅	💪 workout 🦑 deep	❌	✅	✅	❌	❌
5	add-autocorrect-to-git	✅	🦑 deep 🔮 obscura	❌	❌	✅	❌	❌

Exercises:

⚠️ There are no insights in this workout.

Game:

⚠️ There is no game in this workout.

Aspects

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

👶 Introduction

If you are being introduced to the topic for the first time

Insights:

1. workflow-long-running-branches
2. workflow-topic-branches
3. solving-basic-merge-conflicts
4. getting-help
5. undo-a-committed-snapshot
6. search-by-commit-message-keyword
7. search-for-commits-by-author
8. locate-a-commit-by-its-hash
9. viewing-your-tracking-branches
10. checkout-the-previous-branch
11. logging
12. untrack-a-directory-file-without-deleting-it
13. you-can-use-git-offline

⚠️ There are no exercises tagged with this aspect in workflow. :warning: There are no games tagged with this aspect in workflow.

💪 Workout

Theory put into practice/that’s how you achieve X points

Insights:

1. squashing-commits
2. solving-basic-merge-conflicts
3. merging-under-the-hood
4. rebasing
5. the-golden-rule-of-rebasing
6. remember-the-results-of-previous-hunk-conflicts
7. getting-help
8. how-to-unstage-a-staged-file
9. undo-a-committed-snapshot
10. recover-lost-code
11. search-by-commit-message-keyword
12. search-for-commits-by-author
13. locate-a-commit-by-its-hash
14. specify-a-commit-by-its-ancestry
15. specify-a-range-of-commits-using-double-dot-syntax
16. viewing-your-tracking-branches
17. checkout-the-previous-branch
18. move-the-last-commit-to-a-new-branch
19. master-and-origin-aren-t-special
20. prune-remote-tracking-references
21. logging
22. limiting-log-output-by-time
23. make-your-log-output-pretty
24. show-history-of-a-function
25. view-your-commit-history-in-a-graph
26. intent-to-add
27. interactive-staging
28. interactively-stage-patches
29. interactively-unstage-changes
30. use-short-status-to-make-output-more-compact
31. untrack-a-directory-file-without-deleting-it
32. delete-all-untracked-files
33. create-a-new-branch-from-a-stash
34. stashing-changes
35. useful-stashing-options
36. cache-your-authentication-details-to-save-time
37. sign-your-work-using-gpg
38. avoiding-whitespace-issues
39. overcome-line-ending-issues
40. custom-colour-options
41. tracking-shorthands
42. upstream-tracking-shorthand
43. using-aliases-for-git-commands

⚠️ There are no exercises tagged with this aspect in workflow. :warning: There are no games tagged with this aspect in workflow.

🦑 Deep

Prerequisite knowledge consisting of 2 or more 👶/💪 workouts

Insights:

1. workflow-long-running-branches
2. squashing-commits
3. merging-under-the-hood
4. rebasing
5. the-golden-rule-of-rebasing
6. remember-the-results-of-previous-hunk-conflicts
7. modifying-a-previous-commit
8. how-to-unstage-a-staged-file
9. recover-lost-code
10. specify-a-commit-by-its-ancestry
11. specify-a-range-of-commits-using-double-dot-syntax
12. move-the-last-commit-to-a-new-branch
13. prune-remote-tracking-references
14. logging
15. limiting-log-output-by-time
16. make-your-log-output-pretty
17. show-history-of-a-function
18. view-your-commit-history-in-a-graph
19. intent-to-add
20. interactive-staging
21. interactively-stage-patches
22. interactively-unstage-changes
23. use-short-status-to-make-output-more-compact
24. delete-all-untracked-files
25. create-a-new-branch-from-a-stash
26. stashing-changes
27. useful-stashing-options
28. cache-your-authentication-details-to-save-time
29. sign-your-work-using-gpg
30. custom-colour-options
31. you-can-use-git-offline
32. tracking-shorthands
33. upstream-tracking-shorthand
34. using-aliases-for-git-commands
35. add-autocorrect-to-git

⚠️ There are no exercises tagged with this aspect in workflow. :warning: There are no games tagged with this aspect in workflow.

✨ New

Recently added/gained traction feature

Insights:

1. the-golden-rule-of-rebasing

⚠️ There are no exercises tagged with this aspect in workflow. :warning: There are no games tagged with this aspect in workflow.

🔮 Obscura

Stories, obscure details that don’t specifically relate to a learning objective

Insights:

1. git-hub
2. general-github-workflow
3. remember-the-results-of-previous-hunk-conflicts
4. getting-help
5. modifying-a-previous-commit
6. master-and-origin-aren-t-special
7. prune-remote-tracking-references
8. useful-stashing-options
9. cache-your-authentication-details-to-save-time
10. sign-your-work-using-gpg
11. avoiding-whitespace-issues
12. overcome-line-ending-issues
13. you-can-use-git-offline
14. tracking-shorthands
15. add-autocorrect-to-git

⚠️ There are no exercises tagged with this aspect in workflow. :warning: There are no games tagged with this aspect in workflow.

✅ All content has been tagged with aspects.