Downloaded 76 times
Uploaded byKuo-Le Mei
Git - a powerful version control tool
The document outlines Git, a distributed version control system, and includes its basic setup, operations, and life cycle states. It covers fundamental concepts such as commits, staging, and untracked files, along with advanced operations like merging and rebasing. Additionally, it emphasizes better practices for using Git effectively and provides useful links for further learning.
More Related Content
![[系列活動] 機器學習速遊](https://cdn.slidesharecdn.com/ss_thumbnails/mltourhandout-170310083857-thumbnail.jpg?width=640&height=640&fit=bounds)
Similar to Git - a powerful version control tool
Git - a powerful version control tool
- 2. Outline ● What is“git” ? ● Glossary ● Git Clients ● Basic Setup ● Working Model ● Life Cycle ● Basic Operations ● Better Practices ● ● Q&A
- 3. What is ‘git’? ● a distributed version control system ● a powerful version control tool ● and more...
- 4.
- 5.
- 6.
- 7. Working Model Local Centralized (mostcase) Distributed (github, bitbucket, etc.) https://git-scm.com/book/en/v2/Getting-Started-About-Version-Control
- 8.
- 9. Life Cycle Untracked StagedUnstagedCommitted object state action
- 10. Life Cycle Untracked StagedUnstagedCommitted object state action
- 11. Life Cycle Untracked StagedUnstagedCommitted object state action
- 12. Life Cycle Untracked StagedUnstagedCommitted object state action
- 13.
- 14. Basic Operations Untracked StagedUnstagedCommitted object state action new objects
- 15. Basic Operations Untracked StagedUnstagedCommitted object state action new objects $ git init
- 16. Basic Operations Untracked StagedUnstagedCommitted object state action new objects $ git init
- 17. Basic Operations Untracked StagedUnstagedCommitted object state action new objects $ git init $ git add stages objects
- 18. Basic Operations Untracked StagedUnstagedCommitted object state action new objects $ git init $ git add stages objects $ git commit commited objects now, objects in version control
- 19. What’s a commit? changesummaries change descriptions author infomation unique id git “commit”
- 20. Basic Operations Untracked StagedUnstagedCommitted object state action new objects $ git init $ git add stages objects $ git commit commited objects something changed !!! commited objects### objects changes ###
- 21. Basic Operations Untracked StagedUnstagedCommitted object state action New objects $ git init $ git add Stages objects $ git commit Commited objects changes is now in version control but having no change descriptions Unstaged objects### objects changes ### $ git addStages objects
- 22. Basic Operations Untracked StagedUnstagedCommitted object state action New objects $ git init $ git add Stages objects $ git commit Commited objects Unstaged objects### objects changes ### $ git addStages objects changes is now in version control with commit descriptions $ git commit Commited objects
- 23. Basic Operations Untracked StagedUnstagedCommitted object state action New objects $ git init $ git add Stages objects $ git commit Commited objects Unstaged objects### objects changes ### $ git addStages objects $ git commit Commited objects Staged objects$ git rm
- 24. Basic Operations Untracked StagedUnstagedCommitted object state action New objects $ git init $ git add Stages objects $ git commit Commited objects Unstaged objects### objects changes ### $ git addStages objects $ git commit Commited objects Staged objects$ git rm $ git commit Commited objects
- 25. Object State &Change Untracked Staged UnstagedCommitted action $ git diff
- 26. Untracked Staged UnstagedCommitted action $git diff $ git diff --cached Object State & Change
- 27.
- 28.
- 29.
- 30. Better Practices ● ● Subject, length<= 50 chars But… information not enough
- 31.
- 32. Subject, length <=50 chars Blank line between long descriptions and subject long descriptions, length <= 72 chars exception: long link, email, etc. Even Better~! Take responsibility for your commits :-)
- 33.
- 34.
- 35. Advance Operations ● ● ● ● * commithistroy will be changed, danger!!!
- 36. Advance - gitrevert A B C D E HEAD, master $ git revert D before change: A B C D E HEAD, master D’
- 37. Advance - gitreset (1/3) A B C D E HEAD, master $ git reset C before change: A B C D E HEAD, master
- 38. Advance - gitreset (2/3) A B C D E HEAD, master $ git reset --soft C before change: A B C D E HEAD, master
- 39. Advance - gitreset (3/3) A B C D E HEAD, master $ git reset --hard C before change: A B C HEAD, master
- 40. Advance - gitcherry-pick $ git cherry-pick Y before change: A B C D E HEAD, masterX Y Z A B C D E HEAD, masterX Y Z Y’ feature-A feature-A
- 41. Advance - gitrebase $ git rebase C before change: A B C HEAD, feature -A X’ Y’ Z’ A B C HEAD, feature-A X Y Z master master
- 42. Advance - gitmerge (1/4) $ git merge <branch> before change: A B HEAD, master X Y Z HEAD, master, feature-A A B X Y Z feature-A
- 43. Advance - gitmerge (2/4) $ git merge --ff <branch> before change: A B X Y Z HEAD, master, feature-A A B X Y Z HEAD, master feature-A
- 44. Advance - gitmerge (3/4) $ git merge --no-ff <branch> before change: A B X Y Z M HEAD, master A B X Y Z HEAD, master feature-A feature-A
- 45. Advance - gitmerge (4/4) $ git merge <branch> $ git merge --ff <branch> $ git merge --no-ff <branch> before change: A B C D E HEAD, masterX Y Z A B C D E X Y Z M HEAD, master feature-A feature-A
- 46. Advance - gitpull (1/3) $ git pull before change: A B C D E HEAD, master origin/master A B C D E HEAD, master, origin/master
- 47. Advance - gitpull (2/3) $ git pull before change: A B C D E HEAD, master origin/master A B C D E HEAD, master origin/master M
- 48. Advance - gitpull (3/3) $ git pull --rebase before change: A B C D E origin/master A B D E C’ HEAD, masterorigin/master HEAD, master
- 49.
- 50.
- 51.
- 52.