This document provides an overview of Git version control system concepts including the different types of version control systems, the Git file lifecycle, common Git commands and workflows. It covers local and centralized version control systems, describes fast-forward, 3-way and rebase merges, cherry-picking, remote branches, and popular Git workflows like centralized, feature branch and Gitflow.

1. GIT 101
2019.07.17
GIST

2. VCS
• Version Control System
•
•
•
GIST

3. GIST
Local VCS

4. GIST
Centralized VCS

5. Centralized VCS
•
• HDD
• Branch
GIST

6. GIST
Distributed VCS

7. Subversion
• ( )
•
GIST

8. GIST
File Lifecycle

9. GIST
FF Merge
git checkout master
git merge hotfix

10. GIST
3-Way Merge
git checkout master
git merge iss53

11. GIST
Rebase
git checkout experiment
git rebase master

12. GIST
Rebase Onto
git rebase —onto master server client git checkout master
git merge client
git rebase master server
git checkout master
git merge server
git branch -d client
git branch -d server

13. GIST
Cherry Pick
git cherry-pick e43a6fd3e94888d76779ad79fb568ed180e5fcdf

14. GIST
Remote Branch

15. GIST
Remote Branch

16. GIST
Remote Branch

17. GIST
Centralized Workflow

18. GIST
Centralized Workflow

19. GIST
Feature Branch Workflow

20. GIST
Gitflow Workflow
https://nvie.com/posts/a-successful-git-branching-model/

21. GIST
Gitflow Workflow

22. GIST
Gitflow Workflow
Feature Branches

23. GIST
Gitflow Workflow
Release Branches

24. GIST
Fork Workflow
Fork a repository
Making a Pull Request
Clone your fork
Add a remote
Working in a branch: making & pushing changes