Jhonathan Howard Falcutela

• klaseko.com

• Philippine Android Developers Community(fbgroup/padc.you)

• Ruby, JS, Android

• @kaiifalcutela

Git - Why should I use you ?

A simple guide for getting started with git.. no deep shit ;)

Git

 - is a version control system

 - it is free and opensource

 - it is started by Linus Torvalds - the same person who created Linux

 - a command line tool

Setup

- download git for OSX

- download git for Windows

- download git for Linux

Workflow

your local repository consists of three "trees" maintained by git. the first one is your Working Directory which holds the actual files. the second one is the Index which acts as a staging area and finally the HEAD which points to the last commit you've made.

Daily

Git Commands

create a new repository

kaiifalcutela@kaii:~/Desktop/git$ git init
Initialized empty Git repository in /Desktop/git/.git/

git init

checkout a repository

kaiifalcutela@kaii:~/Desktop/git$ git clone /path/to/repository

kaiifalcutela@kaii:~/Desktop/git$ git clone url:path/to/repository

git clone

add & commit

kaiifalcutela@kaii:~/Desktop/git$ git add <filename>

kaiifalcutela@kaii:~/Desktop/git$ git add *

kaiifalcutela@kaii:~/Desktop/git$ git commit -m "Commit Message"

git add

git commit

pushing changes

kaiifalcutela@kaii:~/Desktop/git$ git push origin master

kaiifalcutela@kaii:~/Desktop/git$ git remote add origin <server>

git remote

git push

Collaboration

Github

- the "Hub"

- is a git repository hosting service

- provides a web based graphical interface

- is a centre which all things involving Git revolve

Branching

kaiifalcutela@kaii:~/Desktop/git$ git checkout -b newFeature

kaiifalcutela@kaii:~/Desktop/git$ git checkout master

kaiifalcutela@kaii:~/Desktop/git$ git branch -d newFeature

kaiifalcutela@kaii:~/Desktop/git$ git push origin <branch>

git checkout

git branch

kaiifalcutela@kaii:~/Desktop/git$ git status
On branch build
Your branch is up-to-date with 'origin/build'.

nothing to commit, working directory clean

git status

git push

Update & Merge

kaiifalcutela@kaii:~/Desktop/git$ git pull

kaiifalcutela@kaii:~/Desktop/git$ git merge <branch>

kaiifalcutela@kaii:~/Desktop/git$ git diff <source_branch> <target_branch>

git pull

git merge

git diff

checking logs

kaiifalcutela@kaii:~/Desktop/git$ git log

git log

commit 2a91d8c0b5d66a69d905919edbda0b9c8536e76a
Author: kaiifalcutela <lcaii.sann@gmail.com>
Date:   Sun Mar 29 15:36:47 2015 +0800

    updated readme

commit 6083e3933535ac9fd5e5832b87bf03ae6d892ba0
Author: kaiifalcutela <lcaii.sann@gmail.com>
Date:   Sat Mar 28 15:35:25 2015 +0800

    updated readme

commit 0fb663e40f77e0ed047391a1a469a1ef12e9fb2d
Author: kaiifalcutela <lcaii.sann@gmail.com>
Date:   Fri Mar 27 11:02:32 2015 +0800

    update readme

Updates & Resets

kaiifalcutela@kaii:~/Desktop/git$ git fetch origin

kaiifalcutela@kaii:~/Desktop/git$ git reset --hard origin/master

git fetch

git reset

git revert

kaiifalcutela@kaii:~/Desktop/git$ git revert 09S2T

Thanks!