Git

1. Git Basics
Presentation: 0.5hr
Workshop: 1hr © Terence Chia
Revision: 1.2 1 September 2010

2. Git Basics
● Introduction ● Git Migration
● Get Started ● Git Clients
● Start Coding ● Git Community
● Team ● Git Resources
Development

3. Getting Started
● $git init ● Starts a new local git
●
repository
● $git clone
● Gets a copy of a remote
repository
●

4. Start Coding
● $git add ● Add modified files to
●
“stage”. This prepares
you to commit the files.
●
● Commits file to
● $git commit repository
●

5. What have I done?!
● $git status ● Reveals code status
● $git log ● Shows change log
● $git diff ● Shows diff of changed
●
files
● $git show
● Shows diff by commits
● $git help
● General Git help
●
●
●

6. Team Development
● Setup Identity
● Setup a shared repository
● Basic ways of avoiding conflicts
● Branching
● Merging

7. Team Development
● $git config ● Setup user
● $ git config –global user.name “DevA” configuration & contact
● $git config –global user.email
“DevA@site.com” details
● $git pull ● Pull down changes
● $git push ● Push your updates
● $git stash ● Stash your changes.
Restore to original state

8. Bye bye SVN, CVS
● Git exceeds basic SCM features
● CVS, SVN are history
● Migration from SVN to GIT is simple
● But prepare your SVN users & repository first
● $git svn
● $ git svn clone http://svn/repo/here/trunk

9. Git Clients
● Linux, Windows, MacOS tools
● Command line
● Git Bash
● GitK
● Alot of Git dev integration tools out there.

10. Git Clients
● Linux, Windows, MacOS tools
● Command line
● Git Bash
● GitK
● Alot of Git dev integration tools out there.

11. Git Community
● Git is open sourced under GPLv2
● Public Repositories
– http://github.com
– http://bitbucket.org
● DIY Public Repositories

12. Git Resources
● http://git-scm.com
● http://wiki.glitchdata.com/index.php?title=Git
● http://gitready.com/
● Alot of resources available

13. Thank You
● Let's Practice
● Exercises
© Terence Chia
1 September 2010