KEMBAR78
Game Programming - Git | PDF
Game Programming
Git
Nick Prühs
Objectives
• To get an overview of version control systems in general
• To learn how to use Git in a production environment
• To understand advanced concepts of branching and merging
2 / 58
Local Version Control
3 / 58
Centralized Version Control
4 / 58
Distributed Version Control
5 / 58
Version Deltas
6 / 58
Version Snapshots
7 / 58
Git Areas
8 / 58
Git Lifecycle
9 / 58
DEMO
• Installing Git
• Installing SourceTree
• Creating a GitHub account
• Creating a Git repository
• Cloning the repository
10 / 58
DEMO
• Check file status
• Adding new files
• Viewing changes
• Staging modified files
• Moving files
• Removing files
11 / 58
DEMO
• Pulling
• Commiting changes
• Pushing
12 / 58
DEMO
• Unstaging files
• Reverting files
13 / 58
DEMO
• Viewing history
• Ignoring files
• Tagging
14 / 58
Git Commit Tree
15 / 58
Git Commit & Parents
16 / 58
Git Branch
17 / 58
Git Branches
18 / 58
Git HEAD
19 / 58
Switching Branches
20 / 58
Adding Commits
21 / 58
Switching Branches
22 / 58
Divergent History
23 / 58
Merging Branches
24 / 58
Merging Branches
25 / 58
Origin
26 / 58
Origin
27 / 58
Origin
28 / 58
Hint
Split your work up into small,
unrelated commits!
29 / 78
Git Commit Messages
30 / 58
• ADDED
• CHANGED
• REMOVED
• FIXED
References
• Chacon, Straub. Pro Git. 2nd Edition. Apress, December 24, 2014.
http://www.git-scm.com/doc
31 / 58
Thank you!
http://www.npruehs.de
https://github.com/npruehs
@npruehs
nick.pruehs@daedalic.com

Game Programming - Git