![~blog ➜ git commit -m "Initial blog entry"
[master (root-commit) 5a93468] Initial blog entry
1 files changed, 5 insertions(+), 0 deletions(-)
create mode 100644 lorem.txt
Friday, December 17, 2010 21](https://image.slidesharecdn.com/anintroductiontogithd-101217004405-phpapp01/85/Introduction-to-Git-21-320.jpg)
![~blog ➜ git commit -m "Start of a new line"
[master 3584954] Start of a new line
1 files changed, 4 insertions(+), 1 deletions(-)
Friday, December 17, 2010 26](https://image.slidesharecdn.com/anintroductiontogithd-101217004405-phpapp01/85/Introduction-to-Git-26-320.jpg)
Introduction to Git
- 1. An Introduction to Git James Herdman, Dec. 2010 Twitter: james_herdman Github: http://github.com/jherdman Friday, December 17, 2010 1
- 2. Who Am I? •James Herdman • Ruby and JavaScript programmer • Work for Celect.org • Git user for 3 years Friday, December 17, 2010 2
- 3. I Git Friday, December 17, 2010 3
- 4. Goals • Basic Git workflow • Build a strong foundation • Point you towards your next step Friday, December 17, 2010 4
- 5. Basic. Friday, December 17, 2010 5
- 6. Our Journey • Git at a Glance • What is Version Control? • Using Git Friday, December 17, 2010 6
- 7. Git at a Glance • Version Control System • Supports non-linear development • Cryptographic authentication of history • UNIX principles • Bloody fast Friday, December 17, 2010 7
- 8. Version Control •Managing changes to documents • Prevent loss of work • Sharing documents safely • Maintain versions of documents Friday, December 17, 2010 8
- 9. Version Control is a Misnomer Friday, December 17, 2010 9
- 10. (in Git) Friday, December 17, 2010 10
- 11. It’s All About Changes •Change: a difference in content • History: a collection of changes • Loss of work: loss of changes • Version: collection of documents, at a point in time Friday, December 17, 2010 11
- 12. NAME git - the stupid content tracker Friday, December 17, 2010 12
- 13. NAME git - the stupid content tracker Friday, December 17, 2010 13
- 14. Let’s Get Started! Friday, December 17, 2010 14
- 15. ~ ➜ git init blog Initialized empty Git repository in ~blog/.git/ Friday, December 17, 2010 15
- 16. ~blog ➜ git status # On branch master # # Initial commit # # Untracked files: # (use "git add <file>..." to include in what will be committed) # #" lorem.txt nothing added to commit but untracked files present (use "git add" to track) Friday, December 17, 2010 16
- 17. What’s a Commit? • A change, recorded and tracked by Git • A point in a project’s history Friday, December 17, 2010 17
- 18. Making a Commit 1.Make a change 2.Track it 3.Commit it Friday, December 17, 2010 18
- 19. ~blog ➜ git add lorem.txt Friday, December 17, 2010 19
- 20. ~blog ➜ git status # On branch master # # Initial commit # # Changes to be committed: # (use "git rm --cached <file>..." to unstage) # #" new file: lorem.txt # Friday, December 17, 2010 20
- 21. ~blog ➜ git commit -m "Initial blog entry" [master (root-commit) 5a93468] Initial blog entry 1 files changed, 5 insertions(+), 0 deletions(-) create mode 100644 lorem.txt Friday, December 17, 2010 21
- 22. ~blog ➜ git status # On branch master nothing to commit (working directory clean) Friday, December 17, 2010 22
- 23. Commit Life Cycle “Pro Git”, Scott Chacon. Apress. 2010 Friday, December 17, 2010 23
- 24. ~blog ➜ git status # On branch master # Changed but not updated: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # #" modified: lorem.txt # no changes added to commit (use "git add" and/or "git commit -a") Friday, December 17, 2010 24
- 25. ~blog ➜ git status # On branch master # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # #" modified: lorem.txt # Friday, December 17, 2010 25
- 26. ~blog ➜ git commit -m "Start of a new line" [master 3584954] Start of a new line 1 files changed, 4 insertions(+), 1 deletions(-) Friday, December 17, 2010 26
- 27. What Happened? • Change given unique ID • SHA hex digest of the change itself • Stored in Git’s log (the history) Friday, December 17, 2010 27
- 28. ~blog ➜ git show -p commit 35849545dae48e9b3d073f77a868f8978c95e5a5 Author: James F. Herdman <james.code@me.com> Date: Mon Dec 13 20:00:35 2010 -0500 Start of a new line diff --git a/lorem.txt b/lorem.txt index 1184641..0e2bb4f 100644 --- a/lorem.txt +++ b/lorem.txt @@ -2,4 +2,7 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce e Maecenas id erat sem, id eleifend nulla. Phasellus eget risus egestas erat cons -Quisque vel mi quis nisl gravida consequat ut vel erat. Cras blandit mollis sap No newline at end of file +Quisque vel mi quis nisl gravida consequat ut vel erat. Cras blandit mollis sap + +There once was a tool named Git, +that Linus was sure would be a hit. Friday, December 17, 2010 28
- 29. Branching and Merging Friday, December 17, 2010 29
- 30. Branching • Divergence from main path • Isolate new ideas • Allow for safe collaboration Friday, December 17, 2010 30
- 31. Merging • Combining merge in one branch with another Friday, December 17, 2010 31
- 32. ~snipmate.vim ➜ git branch better-javascript-snippets ~snipmate.vim ➜ git branch better-javascript-snippets * master ~snipmate.vim ➜ git checkout better-javascript-snippets Switched to branch 'better-javascript-snippets' ~snipmate.vim ➜ git branch * better-javascript-snippets master Friday, December 17, 2010 32
- 33. Make Changes Friday, December 17, 2010 33
- 34. Friday, December 17, 2010 34
- 35. ~snipmate.vim ➜ git branch * better-javascript-snippets master ~snipmate.vim ➜ git checkout master Switched to branch 'master' Your branch is ahead of 'origin/master' by 1 commit. ~snipmate.vim ➜ git merge better-javascript-snippets Merge made by recursive. snippets/javascript.snippets | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) ~snipmate.vim ➜ git status # On branch master # Your branch is ahead of 'origin/master' by 5 commits. # nothing to commit (working directory clean) Friday, December 17, 2010 35
- 36. One More Thing Friday, December 17, 2010 36
- 37. The Stash Friday, December 17, 2010 37
- 38. “Hey. Can you fix just this one thing?” Friday, December 17, 2010 38
- 39. “Sure. No problem!” Friday, December 17, 2010 39
- 40. ~snipmate.vim ➜ git status # On branch master # Your branch is ahead of 'origin/master' by 5 commits. # # Changed but not updated: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # #" modified: javascript.snippets # no changes added to commit (use "git add" and/or "git commit -a") Friday, December 17, 2010 40
- 41. ~snipmate.vim/ ➜ git stash Saved working directory and index state WIP on master: 604f234 Merge branch 'better-javascript- snippets' HEAD is now at 604f234 Merge branch 'better-javascript-snippets' Friday, December 17, 2010 41
- 42. ~snipmate.vim ➜ git status # On branch master # Your branch is ahead of 'origin/master' by 5 commits. # nothing to commit (working directory clean) Friday, December 17, 2010 42
- 43. ~snipmate.vim ➜ git stash pop # On branch master # Your branch is ahead of 'origin/master' by 5 commits. # # Changed but not updated: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # #" modified: snippets/javascript.snippets # no changes added to commit (use "git add" and/or "git commit -a") Dropped refs/stash@{0} (b7033f1c44071a8d69a4c8d4716b5781ac117e97) Friday, December 17, 2010 43
- 44. What’s Next? •Pushing • Pulling • Cherry picking • Tagging • Workflows • More! Friday, December 17, 2010 44
- 45. What’s Next? • Git for Designers. http://hoth.entp.com/output/ git_for_designers.html • The Git Parable. http://tom.preston-werner.com/2009/05/19/the-git- parable.html • Pro Git. http://progit.org • Git homepage. http://git-scm.com Friday, December 17, 2010 45
- 46. Questions? Friday, December 17, 2010 46
- 47. Fin. Friday, December 17, 2010 47