Git - the stupid content tracker
Download as PPTX, PDF0 likes547 views
The document discusses Git and version control systems. It provides an overview of Git's history and basic commands. It also discusses Git branching, GUI clients, hosting options on services like GitHub, and resources for learning more about Git. The presentation was given by Eric Van Johnson to the San Diego PHP user group to introduce them to using Git for version control.
![Version Control Systems
Version [revision / source] control system (VCS) is a way to
document and manage changes within an applications.
There are several different VCS systems out there with
some of the more common ones being CVS, SVN,
Mercurial, Bazaar, Visual SourceSafe, and Git.](https://image.slidesharecdn.com/sdphp-gitpresentation-141212131602-conversion-gate01/85/Git-the-stupid-content-tracker-4-320.jpg){kind=tracking}
Git - the stupid content tracker
- 1. presents git the stupid content tracker
- 2. A quick slide about SDPHP Social and Communications: ● MeetUp: http://www.meetup.com/SanDiegoPHP/ ● Facebook: https://www.facebook.com/groups/SanDiegoPUG/ ● Github: https://github.com/sdphp ● Twitter: @sdphp ● IRC: freenode.net #sdphp Website: http://www.sdphp.org/ ● Mentoring Program - http://www.sdphp.org/sdphp-mentoring-program/ ● PHP Resources - http://www.sdphp.org/php-resources/ ● Job Listing - http://www.sdphp.org/job-listings/ Two Monthly Group Meetings (held on different days) ● Downtown San Diego ● North County - Carlsbad Speakers welcome and get a cool SDPHP pint glass.
- 3. A quick slide about Me Eric Van Johnson PHP Developer and Architect and an Organizer of SDPHP ● Github: https://github.com/shocm ● LinkedIn: http://www.linkedin.com/in/vanjohnson ● Twitter: @shocm ● IRC: @shocm ● Website: www.shocm.com
- 4. Version Control Systems Version [revision / source] control system (VCS) is a way to document and manage changes within an applications. There are several different VCS systems out there with some of the more common ones being CVS, SVN, Mercurial, Bazaar, Visual SourceSafe, and Git.
- 5. Git History Git was initially designed and developed by Linus Torvalds in 2005 when he decided a new “distributed” system was needed for the maintenance of the Linux kernel. The development of Git was very quick, beginning on April 3, 2005. The project was announced on April 6, and became self-hosting as of April 7. The first merge of multiple branches was done on 18th of April.
- 6. Basic Git Commands ● git init - Initializes a git repository (repo). A repo is the file structure of the project. ● git status - Displays the current status of the repo ● git add - Stages a file for the next commit ● git commit -m “<message>” - Commits staged files ● git log - Displays commit history ● git remote add <name> <location> - Adds a remote repo to your project ● git push <location> <branch> - Upload (or “push”) files to remote location ● git pull <location> <branch> - Download (or “pull”) files to local system. ● git branch <name> - Create new branch in the repo ● git check <branch name> - Switches to this repo branch
- 8. Git Repo Branching Simple
- 9. Git GUI Clients Github for Mac and Windows http://mac.github.com/ http://windows.github.com/ SourceTree for Mac and Windows http://www.sourcetreeapp.com/ GitX for Mac http://gitx.laullon.com/
- 10. Git Repo Hosting (DIY) git + ssh - Individual git repos can be shared with others over SSH. gitosis (https://github.com/tv42/gitosis) Gitlab (http://gitlab.org/) - Opensource Git management software
- 11. Git Repo Hosting (Commercial) Github- https://github.com/plans Free Unlimited Public Repos $7/mo for 5 private repos (Unlimited Collaborators) Bitbucket- https://bitbucket.org/plans Free Unlimited Public and Private Repos (5 Collaborators) $10/mo for 10 Collaborators Beanstalk - http://beanstalkapp.com/pricing $15/mo for 10 repos and 5 collaborators
- 12. Git Resources and Articles ● Online tutorial: http://try.github.io/levels/1/challenges/1 ● Simple Git Tutorial: http://rogerdudler.github.io/git-guide/ ● Wikipedia: http://en.wikipedia.org/wiki/Git_(software) ● git-flow - https://github.com/nvie/gitflow ● A successful Git branching model - http://nvie.com/posts/a-successful-git-branching-model/ ● “Why aren’t you using GIT-FLOW?” - http://jeffkreeftmeijer.com/2010/why-arent-you-using-git-flow/ ● “Git from Offline to Network” - http://terokarvinen.com/2012/git-from-offline-to-network
- 13. THANK YOU! Eric Van Johnson ● Twitter: @shocm ● IRC: @shocm ● Website: www.shocm.com