20 Essential Commands
Oh Hai! Im Jeremy Lindblom!Ø  I work on the AWS SDK for PHP atØ  Co-organizer of the Seattle PHP Meetup GroupØ  B.S. in...
Intro to Version Control
Version Control•  Also Source Control or Revision Control•  “any practice that tracks and providescontrol over changes to ...
Vocabulary – Part 1•  Repository | Repo – Set of current & pastdata about the files under version control•  Revision | Ver...
Vocabulary – Part 2•  Trunk | Mainline | Master – The maindevelopment path of the repo•  Branch – A divergent development ...
Centralized VCS[2]
Distributed VCS (DVCS)[2]
Git•  A fast, distributed VCS•  Free and open source•  Easy to learn•  Cheap branching•  Staging area•  Local operations
Who is Using Git?•  Facebook•  Microsoft•  Google•  Amazon•  Twitter•  Netflix•  LinkedIn•  Zynga•  Linux•  Android•  Ruby...
20 Essential Commands
Getting Started#1.	  git	  config	  #2.	  git	  help	  
Getting a Repo#3.	  git	  clone	  #4.	  git	  init	  #5.	  git	  remote	  #6.	  git	  fetch	  
Multiple RemotesAWS SDK for PHP
Workflow for Making Changes
Making Changes#7.	  	  git	  pull	  #8.	  	  git	  status	  #9.	  	  git	  add	  #10.	  git	  commit	  #11.	  git	  push	  
Git Takes Snapshots
Examining Changes#12.	  git	  log	  #13.	  git	  diff	  
Undoing Changes#14.	  	  git	  reset	  -­‐-­‐hard	  #15a.	  git	  rm	  #15b.	  git	  rm	  -­‐-­‐cached	  #16.	  	  git	  c...
Branching[3]
Branching#17a.	  git	  branch	  #17b.	  git	  branch	  -­‐d	  #18.	  	  git	  checkout	  #19.	  	  git	  merge	  
Tagging a Release#20.	  	  git	  tag	  #11b.	  git	  push	  -­‐-­‐tags	  
Tools,Workflows, & GitHub
Git HostingThird-party hosting•  GitHub•  Gitorious•  Bitbucket•  SourceForge•  Google Code•  CodePlexSelf-hosting•  Gitol...
Git GUIs•  git-gui + gitk•  GitHub for Mac, GitHub for Windows•  Tower•  GitBox•  SourceTree•  TortoiseGit•  Your IDE
Popular Workflows•  git-flow – http://nvie.com/posts/a-successful-git-branching-model/•  Github Flow – http://scottchacon....
git-flow[4]
AWS SDK for PHP’s Workflow
GitHub[5]
GitHub Features•  Nice web interface•  Facilitates social coding•  Issue and milestone tracker•  Wikis and project pages• ...
.gitignore•  Can specify files, paths, or patterns forGit to ignore (i.e., not track changes)•  Goes in the root of your r...
Wrapping It Up•  Git is a free and fast DVCS•  Git is really popular, especially for OSS•  You now know 20 Git commands•  ...
Questions?Presentation by Jeremy Lindblom – @jeremeamia
References1.  http://en.wikipedia.org/wiki/Revision_control2.  http://git-scm.com/book/en/Getting-Started-About-Version-Co...
Upcoming SlideShare
Loading in...5
×

Git Educated About Git - 20 Essential Commands

1,193

Published on

Git is a free, distributed version control system that is fast, easy to learn, and has great features like cheap local branching and convenient staging areas. It has also taken the open source world by storm, especially with the help of online services like GitHub. Learn 20 essential commands that will help you work with your next project, as well as common conventions and workflows.

Published in: Technology
0 Comments
1 Like
Statistics
Notes
  • Be the first to comment

No Downloads
Views
Total Views
1,193
On Slideshare
0
From Embeds
0
Number of Embeds
1
Actions
Shares
0
Downloads
0
Comments
0
Likes
1
Embeds 0
No embeds

No notes for slide
  • Good evening everyone! I'm glad that you could all be here for our AWS night. Please help yourself to some pizza and drinks if you haven't already. I'm Jeremy, and tonight I want to introduce you to Amazon Web Services and specifically the new AWS SDK for PHP, which we released in the beginning of November. Tonight I will show you how to install it, and I'll cover some of the new features of the SDK, and also demonstrate how it can be used in your applications.
  • Good evening everyone! I'm glad that you could all be here for our AWS night. Please help yourself to some pizza and drinks if you haven't already. I'm Jeremy, and tonight I want to introduce you to Amazon Web Services and specifically the new AWS SDK for PHP, which we released in the beginning of November. Tonight I will show you how to install it, and I'll cover some of the new features of the SDK, and also demonstrate how it can be used in your applications.
  • Good evening everyone! I'm glad that you could all be here for our AWS night. Please help yourself to some pizza and drinks if you haven't already. I'm Jeremy, and tonight I want to introduce you to Amazon Web Services and specifically the new AWS SDK for PHP, which we released in the beginning of November. Tonight I will show you how to install it, and I'll cover some of the new features of the SDK, and also demonstrate how it can be used in your applications.
  • Good evening everyone! I'm glad that you could all be here for our AWS night. Please help yourself to some pizza and drinks if you haven't already. I'm Jeremy, and tonight I want to introduce you to Amazon Web Services and specifically the new AWS SDK for PHP, which we released in the beginning of November. Tonight I will show you how to install it, and I'll cover some of the new features of the SDK, and also demonstrate how it can be used in your applications.
  • Good evening everyone! I'm glad that you could all be here for our AWS night. Please help yourself to some pizza and drinks if you haven't already. I'm Jeremy, and tonight I want to introduce you to Amazon Web Services and specifically the new AWS SDK for PHP, which we released in the beginning of November. Tonight I will show you how to install it, and I'll cover some of the new features of the SDK, and also demonstrate how it can be used in your applications.
  • Transcript of "Git Educated About Git - 20 Essential Commands"

    1. 1. 20 Essential Commands
    2. 2. Oh Hai! Im Jeremy Lindblom!Ø  I work on the AWS SDK for PHP atØ  Co-organizer of the Seattle PHP Meetup GroupØ  B.S. in Computer Science fromØ  @jeremeamia on
    3. 3. Intro to Version Control
    4. 4. Version Control•  Also Source Control or Revision Control•  “any practice that tracks and providescontrol over changes to source code”[1]•  Version control systems ( VCS )– Git– SVN– CVS– Mercurial– Perforce– Clear Case
    5. 5. Vocabulary – Part 1•  Repository | Repo – Set of current & pastdata about the files under version control•  Revision | Version | Commit – A trackedchange to the repo•  Working Copy – Local copy of the repo ata specific revision•  Head | Tip – The most recent revision
    6. 6. Vocabulary – Part 2•  Trunk | Mainline | Master – The maindevelopment path of the repo•  Branch – A divergent development pathof the repo for features, fixes, etc.•  Merge – Integrate revisions from abranch back into trunk or other branch•  Tag – A name or label given to a revision
    7. 7. Centralized VCS[2]
    8. 8. Distributed VCS (DVCS)[2]
    9. 9. Git•  A fast, distributed VCS•  Free and open source•  Easy to learn•  Cheap branching•  Staging area•  Local operations
    10. 10. Who is Using Git?•  Facebook•  Microsoft•  Google•  Amazon•  Twitter•  Netflix•  LinkedIn•  Zynga•  Linux•  Android•  Ruby on Rails•  Eclipse
    11. 11. 20 Essential Commands
    12. 12. Getting Started#1.  git  config  #2.  git  help  
    13. 13. Getting a Repo#3.  git  clone  #4.  git  init  #5.  git  remote  #6.  git  fetch  
    14. 14. Multiple RemotesAWS SDK for PHP
    15. 15. Workflow for Making Changes
    16. 16. Making Changes#7.    git  pull  #8.    git  status  #9.    git  add  #10.  git  commit  #11.  git  push  
    17. 17. Git Takes Snapshots
    18. 18. Examining Changes#12.  git  log  #13.  git  diff  
    19. 19. Undoing Changes#14.    git  reset  -­‐-­‐hard  #15a.  git  rm  #15b.  git  rm  -­‐-­‐cached  #16.    git  clean  -­‐fd  
    20. 20. Branching[3]
    21. 21. Branching#17a.  git  branch  #17b.  git  branch  -­‐d  #18.    git  checkout  #19.    git  merge  
    22. 22. Tagging a Release#20.    git  tag  #11b.  git  push  -­‐-­‐tags  
    23. 23. Tools,Workflows, & GitHub
    24. 24. Git HostingThird-party hosting•  GitHub•  Gitorious•  Bitbucket•  SourceForge•  Google Code•  CodePlexSelf-hosting•  Gitolite•  Gitosis
    25. 25. Git GUIs•  git-gui + gitk•  GitHub for Mac, GitHub for Windows•  Tower•  GitBox•  SourceTree•  TortoiseGit•  Your IDE
    26. 26. Popular Workflows•  git-flow – http://nvie.com/posts/a-successful-git-branching-model/•  Github Flow – http://scottchacon.com/2011/08/31/github-flow.html
    27. 27. git-flow[4]
    28. 28. AWS SDK for PHP’s Workflow
    29. 29. GitHub[5]
    30. 30. GitHub Features•  Nice web interface•  Facilitates social coding•  Issue and milestone tracker•  Wikis and project pages•  Comments and code reviews•  Forking and Pull Requests (PRs)
    31. 31. .gitignore•  Can specify files, paths, or patterns forGit to ignore (i.e., not track changes)•  Goes in the root of your repo*.log  .DS_Store  Thumbs.db  vendor/  
    32. 32. Wrapping It Up•  Git is a free and fast DVCS•  Git is really popular, especially for OSS•  You now know 20 Git commands•  There are lots of tools that support Git•  GitHub is an awesome Git host withadditional features like forking and PRs
    33. 33. Questions?Presentation by Jeremy Lindblom – @jeremeamia
    34. 34. References1.  http://en.wikipedia.org/wiki/Revision_control2.  http://git-scm.com/book/en/Getting-Started-About-Version-Control3.  http://hades.name/blog/2010/01/22/git-your-friend-not-foe-vol-2-branches/4.  http://nvie.com/posts/a-successful-git-branching-model/5.  https://github.com/aws/aws-sdk-php

    ×