图解Git
0 likes493 views
This document discusses version control and Git. It begins with an introduction to why version control is useful. It then covers setting up Git, basic Git commands like add, commit, diff and log. It discusses checking out different commits, branches, merging, pushing and pulling from remote repositories. It introduces concepts like stash, remote repositories, cloning and the Gitflow branching model.
![• git checkout commit HASH
• commit
[c164575]
[257ffc9]
[81a6cf1]
git checkout 257ffc9](https://image.slidesharecdn.com/git-160426013933/85/Git-72-320.jpg)
![• git checkout (branch name)
• master
[c164575]
[257ffc9]
[81a6cf1]
git checkout master
<master>](https://image.slidesharecdn.com/git-160426013933/85/Git-73-320.jpg)
![•
• HEAD
[c164575]
[257ffc9]
[81a6cf1]
git checkout HEAD^
git checkout HEAD~
git checkout HEAD~1
<HEAD>
<HEAD>
commit](https://image.slidesharecdn.com/git-160426013933/85/Git-74-320.jpg)
![•
• HEAD
[c164575]
[257ffc9]
[81a6cf1]
git checkout HEAD^
<HEAD>
<HEAD>
<HEAD>
git checkout HEAD^](https://image.slidesharecdn.com/git-160426013933/85/Git-75-320.jpg)
![•
• HEAD
[c164575]
[257ffc9]
[81a6cf1]
git checkout HEAD^^
<HEAD>
<HEAD>
<HEAD>
git checkout HEAD~2
commit](https://image.slidesharecdn.com/git-160426013933/85/Git-76-320.jpg)
![COMMIT
• commit
• checkout
<master>
<master>
git reset —hard HEAD^^[c164575]
[257ffc9]
[81a6cf1]
git reset —hard 81a6cf1
git reset —hard master~2
<HEAD>](https://image.slidesharecdn.com/git-160426013933/85/Git-78-320.jpg)
图解Git
- 1. TONY DENG https://tonydeng.github.io https://twitter.com/wolfdeng
- 2. 为什么要版本控制？
- 8. ……
- 9. ……
- 10. ……
- 11. ……
- 16. ......
- 18. ......
- 20. ......
- 21. ...... ......
- 24. ......
- 25. ...... ......
- 27. ……
- 30. ......
- 36. ......
- 37. ...... ……
- 43. ( )
- 46. ……
- 49. • • •
- 50. • •
- 51. • Linus Torvalds Linux • • • • • •
- 52. Terminal
- 53. CLI • — • • •
- 55. Mac brew install git Ubuntu/Debian apt-get install git Fedora/CentOS yum install git-core Windows google/baidu
- 56. GIT Setup
- 57. git config —global user.name “your name” email git config —global user.email “your email”
- 58. Basic
- 59. • git git init
- 60. ( ) Coding
- 61. STAGE • • • Stage git add file1 file2
- 62. COMMIT • • • (commit message) • git commit -m ‘message’
- 64. Stage a.txt
- 65. Stage a.txt
- 67. COMMIT a.txt git commit -m ‘update a’ Stage
- 68. git
- 70. • commit HASH commit message git log
- 71. • commit git reset —hard git checkout . • git checkout a.txt
- 72. • git checkout commit HASH • commit [c164575] [257ffc9] [81a6cf1] git checkout 257ffc9
- 73. • git checkout (branch name) • master [c164575] [257ffc9] [81a6cf1] git checkout master <master>
- 74. • • HEAD [c164575] [257ffc9] [81a6cf1] git checkout HEAD^ git checkout HEAD~ git checkout HEAD~1 <HEAD> <HEAD> commit
- 75. • • HEAD [c164575] [257ffc9] [81a6cf1] git checkout HEAD^ <HEAD> <HEAD> <HEAD> git checkout HEAD^
- 76. • • HEAD [c164575] [257ffc9] [81a6cf1] git checkout HEAD^^ <HEAD> <HEAD> <HEAD> git checkout HEAD~2 commit
- 77. COMMIT • commit • <master> commit commit <master> <master> git reset —hard HEAD^
- 78. COMMIT • commit • checkout <master> <master> git reset —hard HEAD^^[c164575] [257ffc9] [81a6cf1] git reset —hard 81a6cf1 git reset —hard master~2 <HEAD>
- 79. git branch
- 80. <master>
- 81. <master> <develop> git branch develop git checkout develop git checkout -b develop
- 82. <master> <develop> git add —all git commit -m ‘…’ …… Stage commit!
- 85. <master> <develop> git checkout master git merge develop master develop
- 89. git add git commit …
- 90. git remote
- 91. • git repository(Repo) git init repository
- 92. • git ——> • • gitlab ——> • git remote repository
- 93. git remote add origin git@github.com:tonydeng/gitignore.git git remote add origin https://github.com/tonydeng/gitignore.git origin origin
- 94. <master> <master> git push origin master origin
- 95. <develop> <develop> git push origin develop origin
- 96. <master> <master> git pull origin master origin
- 97. <master> <master> git clone git@github.com:tonydeng/gitignore.git origin git clone https://github.com/tonydeng/gitignore.git
- 99. Remote Repo A B git clone … git clone …
- 102. Remote Repo A B
- 105. Remote Repo A B B pull… fetch pull = fetch & merge
- 106. Remote Repo A B B pull… fetch merge pull = fetch & merge
- 107. B push
- 108. B push
- 109. PULL = FETCH & MERGE ! • pull merge • merge merge
- 110. git stash
- 112. • branch ....... commit git stash
- 113. • branch ....... commit git stash
- 114. • branch ....... commit git stash git stash save ‘…’
- 115. • stash git stash list stash
- 116. git stash pop git stash pop git stash apply git stash apply git stash drop git stash drop ( ) stash pop stash stash
- 118. Branch怎 用？ git flow
- 119. • master : production • develop : master checkout
- 121. • feature branches • bugs • develop • merge develop • develop
- 123. • release branches • release bugs • develop • merge master develop
- 124. • hotfix branches • release • master • merge master develop
- 126. Q & A