Gittalk
•Download as KEY, PDF•
0 likes•788 views
Git is a distributed version control system that allows developers to work on codebases simultaneously and merge changes easily. It uses a local repository that can be synced to remote repositories hosted on services like GitHub. Developers clone repositories, make changes on branches, commit locally, and push updates to the remote. Git addresses issues like file locking and enables features like easy merging and reverting changes. Stashing is used to temporarily store uncommitted changes when switching branches. GUI clients and documentation on sites like GitHub help users learn and use Git's powerful capabilities for collaboration.
Report
Share
Related slideshows
Gittalk
- 1. Git and Github Basics http://git-scm.com
- 2. Why Git?
- 4. Why Git? Distributed Repositories Easy Merging
- 5. Why Git? Distributed Repositories Easy Merging No File Locks
- 7. Starting From Scratch? new_project patrick$ git init Initialized empty Git repository in /Users/patrick/gittalk/ new_project/.git/
- 9. Existing Repository? patrick$ git clone git@github.com:thelearninghouse/ request-forms.git <location>
- 10. Committing a change patrick$ echo "Initial README" > README patrick$ git add README patrick$ git commit -m "Added README" [master (root-commit) 5008efe] Added README 1 file changed, 1 insertion(+) create mode 100644 README
- 11. What Happened?
- 12. What Happened? patrick$ git log commit 5008efe3eab3e746f1d54214566c6b3ed79d3656 Author: Patrick Tinsley <prtinsley@gmail.com> Date: Thu Oct 25 21:31:17 2012 -0400 Added README
- 13. How Git Works Working Directory git add Staging git commit Repository
- 14. Workflow Code Stage your changes (git add) Review your work (git status, git diff) Commit (locally) (git commit) Repeat
- 16. Un-Staged Changes patrick$ echo “I’m updating this again.” > README
- 17. Un-Staged Changes patrick$ echo “I’m updating this again.” > README patrick$ git status # On branch master # Changes not staged for commit: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # modified: README # no changes added to commit (use "git add" and/or "git commit -a")
- 18. Staged Changes
- 19. Staged Changes patrick$ git add .
- 20. Staged Changes patrick$ git add . patrick$ git status # On branch master # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # modified: README #
- 21. Reset
- 22. Reset patrick$ git reset Unstaged changes after reset: M README
- 23. Reset patrick$ git reset Unstaged changes after reset: M README patrick$ git status # On branch master # Changes not staged for commit: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # modified: README # no changes added to commit (use "git add" and/or "git commit -a")
- 24. Hard Reset
- 25. Hard Reset patrick$ git reset --hard HEAD HEAD is now at e502220 Test update
- 26. Why Branch?
- 27. Why Branch? Safely experiment with new ideas
- 28. Why Branch? Safely experiment with new ideas Agility
- 29. Why Branch? Safely experiment with new ideas Agility Git makes branching easy
- 30. Why Branch? Safely experiment with new ideas Agility Git makes branching easy Git makes merging (usually...) very easy
- 31. Branch and Merge c5 c4 c3 c2 c1 master c2 c1 new_feature
- 32. How Do We Do It?
- 33. How Do We Do It? patrick$ git checkout -b new_feature Switched to a new branch 'new_feature'
- 34. How Do We Do It? patrick$ git checkout -b new_feature Switched to a new branch 'new_feature' patrick$ git branch master * new_feature
- 35. How Do We Do It? patrick$ git checkout -b new_feature Switched to a new branch 'new_feature' patrick$ git branch master * new_feature patrick$ git checkout master Switched to branch 'master'
- 36. How Do We Do It? patrick$ git checkout -b new_feature Switched to a new branch 'new_feature' patrick$ git branch master * new_feature patrick$ git checkout master Switched to branch 'master' patrick$ git branch -d new_feature Deleted branch new_feature (was 5008efe).
- 38. What About Merging? patrick$ git checkout master Switched to branch 'master'
- 39. What About Merging? patrick$ git checkout master Switched to branch 'master' patrick$ git merge update_readme Updating 01ba47f..ee04cb3 Fast-forward README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
- 40. Conflict!
- 41. Conflict! patrick$ git merge update_readme Auto-merging README CONFLICT (content): Merge conflict in README Automatic merge failed; fix conflicts and then commit the result.
- 42. What Happened?
- 43. What Happened? patrick$ git status # On branch master # Unmerged paths: # (use "git add/rm <file>..." as appropriate to mark resolution) # # both modified: README # no changes added to commit (use "git add" and/or "git commit -a")
- 45. Remote Repositories Github.com Another copy, much like yours Backup Collaborate Distribute Service Hooks
- 47. Working With Github Update your knowledge of Github (git fetch)
- 48. Working With Github Update your knowledge of Github (git fetch) Update your local copy (git pull)
- 49. Working With Github Update your knowledge of Github (git fetch) Update your local copy (git pull) Push your code to Github (git push)
- 50. Example
- 51. Example example_app patrick$ git pull origin master From github.com:prtinsley/example_app * branch master -> FETCH_HEAD Already up-to-date.
- 52. Example example_app patrick$ git pull origin master From github.com:prtinsley/example_app * branch master -> FETCH_HEAD Already up-to-date. example_app patrick$ git push origin master Counting objects: 5, done. Delta compression using up to 8 threads. Compressing objects: 100% (3/3), done. Writing objects: 100% (3/3), 300 bytes, done. Total 3 (delta 2), reused 0 (delta 0) To git@github.com:prtinsley/first_app.git 261f716..8b66dca master -> master
- 53. Stashing
- 54. Stashing Cannot change branches with pending changes Save your work if not ready to commit Apply pending changes to a different branch Works like a stack
- 55. Example
- 56. Example patrick$ git status # On branch master # Changes not staged for commit: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # modified: README
- 57. Example patrick$ git status # On branch master # Changes not staged for commit: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # modified: README patrick$ git stash Saved working directory and index state WIP on master: 92a5183 Updated README HEAD is now at 92a5183 Updated README
- 58. Example
- 59. Example patrick$ git status # On branch master nothing to commit (working directory clean)
- 60. Example patrick$ git status # On branch master nothing to commit (working directory clean) patrick$ git stash apply # On branch master # Changes not staged for commit: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # modified: README #
- 61. Deployments Code pulled from repository or build archive Code not checked in will be overwritten Soon all production servers will be IT access only
- 62. Resources http://help.github.com http://git-scm.com/book Definitive guide written by a Github dev http://net.tutsplus.com/tutorials/other/easy- version-control-with-git/ Much more basic
- 63. GUI Clients Tower http://www.git-tower.com/ SourceTree http://www.sourcetreeapp.com/ Github for Mac http://mac.github.com/
- 64. Questions?
- 66. Context
- 67. Activity Feed
- 69. Clone URL
- 70. Branches
- 71. Commit History
- 72. Commit History
- 73. Change Sets
- 75. Questions?
- 76. Slides Available
Editor's Notes
- \n
- \n
- \n
- \n
- \n
- \n
- \n
- \n
- \n
- \n
- \n
- \n
- \n
- \n
- \n
- \n
- \n
- \n
- \n
- \n
- \n
- \n
- \n
- \n
- \n
- \n
- \n
- \n
- \n
- \n
- \n
- \n
- \n
- \n
- \n
- \n
- \n
- \n
- \n
- \n
- \n
- \n
- \n
- \n
- \n
- \n
- \n
- \n
- \n
- \n
- \n
- \n
- \n
- \n
- \n
- \n
- \n