Git Distributed Version Control System
5 likes828 views
The document provides an outline on installing and configuring Git, introduces common Git concepts and commands, discusses various Git workflows and hosting options on GitHub and Bitbucket, and includes examples of using Git in case studies. It covers topics such as setting up a local and global Git configuration, interacting with the staging area and working directory, branching and merging, and resolving conflicts. The document is intended to teach users the basics of using the popular version control system Git.
![You have pushed a WordPress folder in the Github and pull it from
the server.
But you make a mistake, you want to
- keep the wp-con?g.php in the server
- remove it on the GitHub, so your colleagues won't get a copy of
the wp-con?g.php
[On the server]
$ vim .gitignore
$ git commit -am 'ignore wp-con?g.php ?le'
$ git rm --cached wp-con?g.php
$ git commit -m 'remove wp-con?g.php'
$ git push](https://image.slidesharecdn.com/gitdistributedversioncontrolsystem-13535167682511-phpapp02-121121105353-phpapp02/85/Git-Distributed-Version-Control-System-41-320.jpg)
Git Distributed Version Control System
- 2. Outline Install and Con?gure Git (x) Git Concepts Git Commands Git Work?ow Git Hosting (GitHub, Bitbucket) Case Studies
- 3. Installation Git for OS X http://code.google.com/p/git-osx-installer/ Git for Windows http://code.google.com/p/msysgit/
- 4. Setting user's name and email globally in git $ git con?g --global user.name "Victor Wong" $ git con?g --global user.email "victorwkm@gmail.com" $ git con?g user.name bonus: $ cat ~/.gitcon?g
- 5. Add color to status and branch $ git con?g --global color.status auto $ git con?g --global color.branch auto
- 6. Git Concepts
- 7. Git Concepts remote repo <-> local repo <-> staging area <-> working directory # On branch master # Changes to be committed: # (use "git reset HEAD <?le>..." to unstage) # Changed but not updated: # (use "git add <?le>..." to update what will be committed) # (use "git checkout -- <?le>..." to discard changes in working directory) # Untracked ?les: # (use "git add <?le>..." to include in what will be committed)
- 10. Basic Git Commands Creating & Getting Branching Inspection init branch log clone checkout show merge Basic Remote Sharing status remote add push commit pull mv, rm fetch tag
- 11. Advanced Git Commands git-stash git-pop git-apply git-blame git-diff git-re?og git-reset git-revert git-clean git-rebase git-fetch
- 12. Branch
- 13. $ git branch testing
- 14. $ git checkout testing
- 15. new commit on testing branch
- 16. $ git checkout master
- 17. $ git commit -m 'Change the master!'
- 18. Merge
- 19. $ git checkout master $ git merge iss53 Merge made by recursive. README | 1 + 1 ?les changed, 1 insertions(+), 0 deletions(-)
- 20. Con?ict
- 21. $ git status $ vim index.html $ git add index.html $ git commit
- 23. Git Work?ow
- 26. Centralized Work?ow (us)
- 28. Dictator and Lieutenants Work?ow (Linux)
- 29. github.com
- 30. GitHub Code Review Commit Comments Analyze Branches Compare View Pull request
- 31. Case Studies
- 32. Can I change the commit message before or after push?
- 33. Can I change the commit message before or after push? $ git commit --amend bonus: $ git rebase -i Note: Never change your commit history after push to a public repository!
- 34. How do I ignore ?les in a project? Some ?les such as .log which shouldn't be include in every project, can I ignore it in every projects?
- 35. How do I ignore ?les in a project? Some ?les such as .log which shouldn't be include in every project, can I ignore it in every projects? $ vim .gitignore ... add the ?le and folder path that you don't want git to track ... $ vim ~/.gitignore_global $ git con?g --global core.excludes?le ~/.gitignore_global Bonus: git con?g --global --list Remind: Don't add too much ?les in the globa excludes?le
- 37. Search commit message git log -g --grep=<pattern> -g, --walk-re?ogs Instead of walking the commit ancestry chain, walk re?og entries from the most recent one to older ones. --grep=<pattern> Limit the commits output to ones with log message that matches the speci?ed pattern (regular expression).
- 38. Can I change the ?lename case in Git? fatal: destination exists, source=font.ttf, destination=Font.ttf
- 39. Can I change the ?lename case in Git? fatal: destination exists, source=font.ttf, destination=Font.ttf git mv -f font.ttf Font.ttf
- 40. You have pushed a WordPress folder in the Github and pull it from the server. But you make a mistake, you want to - keep the wp-con?g.php in the server - remove it on the GitHub, so your colleagues won't get a copy of the wp-con?g.php
- 41. You have pushed a WordPress folder in the Github and pull it from the server. But you make a mistake, you want to - keep the wp-con?g.php in the server - remove it on the GitHub, so your colleagues won't get a copy of the wp-con?g.php [On the server] $ vim .gitignore $ git commit -am 'ignore wp-con?g.php ?le' $ git rm --cached wp-con?g.php $ git commit -m 'remove wp-con?g.php' $ git push
- 42. Clients: This feature worked well in the past. Why does it not work properly today? We: How do we use Git to quickly identify the issue?
- 43. Clients: This feature worked well in the past. Why does it not work properly today? We: How do we use Git to quickly identify the issue? Use GitHub to: search history blame $ git checkout <commit-sha>
- 44. Can I undo a git commit?
- 45. Can I undo a git commit? Preserve all changes as unstaged changes $ git reset HEAD^ Preserve all changes $ git reset --soft HEAD^ Discard all changes $ git reset --hard HEAD^
- 46. You are on a branch called "development", and you received an email from the client said this bug needs to be ?xed now! Hence, you tried to switch your branch to "hot?x" or "master" to do a quick ?x, but your working dirctory is "dirty", what should you do?
- 47. You are on a branch called "development", and you received an email from the client said this bug needs to be ?xed now! Hence, you tried to switch your branch to "hot?x" or "master" to do a quick ?x, but your working dirctory is "dirty", what should you do? $ git stash $ git checkout master ... ?x issue ... $ git commit -am "?x issue #100" $ git checkout development $ git stash list $ git stash pop bonus: $ git stash apply stash@{0} $ git stash drop stash@{0}
- 48. The same code can also applied to the following scenario. After ?nishing the development, you suddenly realized the you are developing a feature on the WRONG branch. Can I save those changes and apply those changes in the correct branch?
- 49. Recommendations Read the git ERROR message Commit or lose it Do one thing at a time (the smaller the better) Don¡¯t modify any history after pushing to live Practice together
- 50. References Git Reference http://gitref.org/ Pro Git http://git-scm.com/book
Editor's Notes
- #2: \n
- #3: \n
- #4: \n
- #5: \n
- #6: \n
- #7: \n
- #8: \n
- #9: \n
- #10: \n
- #11: \n
- #12: \n
- #13: \n
- #14: \n
- #15: \n
- #16: \n
- #17: \n
- #18: \n
- #19: \n
- #20: \n
- #21: \n
- #22: \n
- #23: \n
- #24: \n
- #25: \n
- #26: \n
- #27: \n
- #28: \n
- #29: \n
- #30: \n
- #31: \n
- #32: \n
- #33: \n
- #34: \n
- #35: \n
- #36: \n
- #37: \n
- #38: \n
- #39: \n
- #40: \n
- #41: \n
- #42: \n
- #43: \n
- #44: \n
- #45: \n
- #46: \n
- #47: \n
- #48: \n
- #49: \n
- #50: \n
- #51: \n