More Related Content
What's hot
What's hot (20)
Similar to Git Tutorial Yang Yang
Similar to Git Tutorial Yang Yang (20)
Recently uploaded
Recently uploaded (20)
Git Tutorial Yang Yang
- 2. Linus_Torvalds 1969~ Talk is cheap, show me the code. 2008 Git Github 2005 2005/04/06 Kickoff Release 2005/04/03
- 3. Distributed Version Control Repository Repository Repository Repository Workspace Workspace Workspace commit update commit update commit update push pull pull push push pull
- 4. SHA-1 • Any => 160 bit • Data integrity • Collision < 1 / 2128
- 5. Linux Diff • Normal diff • Context diff • Unified diff $ diff a.txt b.txt $ diff -c a.txt b.txt $ diff -u a.txt b.txt
- 6. Git Object Model commit size tree parent author initial version ea60b35 seayang nil tree size blob tree 22432a1 230ba31 tree size blob tree 1aea134 2630b31 tree size blob 1a32454 blob size …… blob size …… blob size …… Commit Object Tree Object BLOB Object
- 8. Working Process StageWorkspace Local Repository Remote Repository add commit push fetch pull checkout ——file checkout HEAD ——file diff HEAD diff diff ——cached reset ——file
- 9. File Status Lifecycle untracked add edit stage commit checkout unmodified modified staged
- 10. $ git add . $ git commit -m ‘initial version’ $ git commit ——amend $ git rm $ git rm —cached $ git push -u origin master Basic Operation
- 11. Diff $ git diff <file_name> $ git diff ——cached <file_name> $ git diff HEAD <file_name> $ git diff <commit_id> <file_name> $ git diff ——cached <commit_id> <file_name> $ git diff <commit_id> <commit_id> <file_name> workspace stage repository HEAD commit_id commit_id 1 2 3 1 2 3 4 5 6 4 5 6 After Git1.6.1, git diff ——staged = git diff ——cached
- 12. Branch $ git checkout -b <branch_name> $ git branch <branch_name> $ git branch $ git branch -r $ git branch -a $ git branch -m <branch_name> <branch_new_name> $ git branch -d <branch_name> $ git push origin ——delete <branch_name>
- 13. Merge master hotfix C1 C2 C3 hotfix master C1 C2 C3 C5 master hotfix C1 C2 C3 hotfix master C1 C2 C3 C6 C5 Fast-forward Auto-merging $ git checkout master $ git merge hotfix C0 C0 C0 C0 C4 C4
- 14. Rebase $ git checkout hotfix $ git rebase master hotfix master C1 C2 C3 C5 C0 C4 hotfix master C1 C2 C3 C5’C0 C4’ $ git rebase ——onto master branch1 hotfix
- 15. Checkout(1/3) $ git checkout <branch_name> workspace stage 3daa55f ac85f73 ac85f73 3724d64 master $ git checkout yang HEAD yang HEAD ea60b35
- 16. Checkout(2/3) $ git checkout <commit_id> workspace stage ea60b35 3daa55f ac85f73 ac85f73 3724d64 master $ git checkout 3daa55f HEAD HEADyang detached HEAD
- 17. Checkout(3/3) $ git checkout <commit_id> <file_name> ea60b35 3daa55f ac85f73 ac85f73 3724d64 master $ git checkout HEAD^ <file_name> HEAD yang workspace stage
- 18. Reset $ git reset <commit_id> $ git reset HEAD $ git reset HEAD^ $ git reset HEAD^^ $ git reset HEAD~n $ git reset reflog
- 19. Reset Parameters $ git reset ——soft <commit_id> $ git reset <commit_id> $ git reset ——hard <commit_id> HEAD Stage WORKSPACE= =hard: soft: mixed: HEAD stage WORKSPACE!= != HEAD Stage WORKSPACE= !=
- 20. git reset <commit_id> $ git reset <commit_id> workspace stage ea60b35 3daa55f ac85f73 ac85f73 3724d64 master $ git reset HEAD~3 HEAD yang master HEAD if not ——soft if ——hard
- 21. git reset workspace stage ea60b35 3daa55f ac85f73 ac85f73 3724d64 master $ git reset HEAD yang if ——hard
- 22. git reset <file_name> workspace stage ea60b35 3daa55f ac85f73 ac85f73 3724d64 master $ git reset app.py HEAD yang
- 23. Remote $ git clone server_path $ git remote add origin server_path $ git push -u origin master $ git fetch $ git pull = git fetch + git merge $ git checkout -b branch_name origin/branch_name $ git push origin :branch_name
- 24. Stashing $ git stash $ git stash pop $ git stash list $ git stash apply $ git stash drop
- 25. Patch • git diff <branch_name> > patch • git format-patch -M <branch_name>
- 26. Tagging $ git tag $ git tag <tag_name> <commit_id> $ git push origin ——tags $ git tag -d <tag_name> $ git push origin :refs/tags/<tag_name>
- 28. Alias $ git config ——global alias.st status [alias] st = status ad = add co = checkout cm = commit br = branch df = diff mg = merge rs = reset lg = log line = log ——oneline $ vi ~/.gitconfig