DrupalCamp, Athens, 12 December 2010
An intro to Git and GitHubDrupal will be soon hosted at GiHub but before that learn Git for your own good and sanity Panagiotis Papadopoulos 6pna / Sfalma @panosjee
Who am I?Freelancer and startuper
What is Git?Git is a
distributed revision control system with an emphasis on speed. Gitwas initially designed and developed by Linus Torvalds for Linuxkernel development.Every Git working directory is a full-fledged repository with complete historyand full revision tracking capabilities, not dependent on network access or acentral server.Gits current software maintenance is overseen by Junio Hamano. Git is freesoftware distributed under the terms of the GNU General PublicLicense version 2.If Git is a heavenly tool, GitHub is a programmer s heaven. - PanosJee, December 12th 2010 Source: http://en.wikipedia.org/wiki/Git_(software)
Git is a very simple
beast!Git is: Distributed Non linear development Efficient very small footprint Consists of Git objects which are the actual data of Git, the main thing that the repository is made up of. The four main objects of Git are blobs, trees, commits and tags. A Git object is a file in the repository compressed (with Zlib) and referenced by the SHA-1 value of its contents plus a small header. The contents of a file are stored as blobs.
The Git model (1)A simple
repo withthe following Commandsstructure: $ git init . $ git add . $ git commit -m "first commit"- module - init.php -- includes - definitions.php -- lib - model.php Example from the excellent http://peepcode.com/products/git-internals-pdf
The Git model (2)A simple
repo withthe following Commandsstructure: $ git tag "first tag" $ mkdir validators $ touch email.php $ git add .- module $ git commit -m "added validators" - init.php -- includes - definitions.php -- lib - model.php -- validators - email.php Example from the excellent http://peepcode.com/products/git-internals-pdf
The Git model (3) A
simple repo with the following structure: - module - init.php -- includes - definitions.php -- lib - model.php * -- validators - email.phpCommands$ vim model.php$ git add .$ git commit -m "include validators" Example from the excellent http://peepcode.com/products/git-internals-pdf
The Git model (4)A simple
repo withthe followingstructure:- module - init.php -- includes - definitions.php -- lib - model.php -- validators - email.php Example from the excellent http://peepcode.com/products/git-internals-pdf
Git stashReal life scenario.You are
working on your code and your colleagues just pusheda very important fix that you needed.You cannot pull changes if you have not commited your code,but you should not commit as you are still experimenting.What do you do ?Just put your changes aside (git stash) get your friends changes(git pull) and then apply your changes that you had pust aside(git stash apply).Neat?
Commit to Open Source in
a breezeThe distributed nature of Git The procedure is simple:means you can work locally 1. Find an open source project 2. Fork iton code and push to a 3. Clone (download locally)remote repository when 4. Do your changesready. 5. Push to your remoteThis is perfect for teams and Wanna have your changesOpen Source projects. merged into initial repo? 1. Do a pull request 2. Hope the author accepts it
$ tools“The bad workman blames
his tools” American Proverb“We shape our tools and afterwards our tools shape us.”Marshall McLuhanThe best tool you need is to learn the internals of Git you canunderstand how it works.The second best tool is the command line. Master it. You willnever look back.Git integrates with various IDEs like Eclipse, NetBeans.There are also great standalone Git apps.
GitHub is the Facebook of
CodeGitHub is an unparallel tool I am always struck by thethat offers you unlimited wealth of project I find onpublic repos and private GitHub.repos on subscriptions plans. Lots of major open source projects are there for you toGithub is: use and study. 1. Collaboration tool Fork them, change them, 2. Code host contribute in no time. 3. Wiki 4. Issue tracker 5. Code review tool If you are a coder and you 6. Git UI have never used GitHub you 7. Social probably live in a parallel universe :P