Intro to Git

This is an intro level presentation on Git. In this presentation, I give some background on Git, discuss key concepts behind Git, and introduce some Git commands.

Transcript

2. • Some History • About Git • Git commands • Using git with svn • Dev workflows Agenda
3. Some History
4. http://2.bp.blogspot.com/_z6qpykplUvI/TOEcCn2EutI/AAAAAAAAA68/X9eL0yV8RsQ/s1600/scmhistory.png
5. Git is Popular…
6. Linus Torvalds
7. 2,426,953 people hosting over 4,154,393 repositories
9. Eclipse Users Survey 2009: 2010: 2011: 2012: svn 57.5% 58.3% 51.3% 46.0% git 2.4% 6.8% 12.8% 27.6%
10. Git is not svn++
11. Distributed Version Control System
12. Centralized
13. Distributed
14. Distributed
15. http://programmers.stackexchange.com/questions/35074/im-a-subversion- geek-why-should-i-consider-or-not-consider-mercurial-or-git-or Large Project Workflow
16. Lightweight Branching
17. • Frictionless Context Switching • Role-Based Code lines • Feature Based Workflow • Disposable Experimentation
18. Track Snapshots, Not Differences
19. svn git
20. Git Clients
21. Git Syntax git <commandname> [options]
22. Git File Lifecycle
23. Basic Commands #create an empty repository in cwd git init #add contents to the next commit git add #show the working tree status git status #record changes to the repository git commit #show commit log git log
24. A Simple Example #new git repo git init #add a file touch my-file.txt #add changes to staging area git add my-file.txt #commit staged changes git commit -m "made some changes"
25. Sharing Changes #get new changes from external repository git fetch #fetch + merge git pull # write new changes to external repository git push
26. Branching #create/modify/delete branches git branch #switch working dir to another branch/commit git checkout #merge two or more branches git merge #changes starting point of a branch git rebase #set a branch back to HEAD git reset
27. Many More Complex Commands…
28. Git Bisect #binary search commit history for a commit #e.g. a commit introducing a bug git bisect start git bisect good ae4f902 git bisect bad c5f9814
29. Setup Git with svn #create local git svn repo git svn init -s http://url-of-repo git svn fetch git svn rebase
30. Git svn Workflow #work on a local branch or branches git checkout -b myfeature #make some changes and commit git commit -a -m "made some changes" #switch to master and rebase changes git checkout master git rebase myfeature git svn rebase #commit changes to svn git svn dcommit
31. Example Usage
41. Team Workflow
43. Many More Possibilities
44. http://git-scm.com/book
45. http://try.github.com/levels/1/challenges/1