Git thinking

Git - Step by step

Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

Goal

We would like to make snapshotsof the university thesis.

mailto:[email protected]



Thesis

images/

univ_logo.png

main_page.tex

introduction.tex




Create backup

images

univ_logo.png

main_page.tex

introduction.tex

copy

backup

2011-09-11

2011-10-01_images_ready

2011-11-22_release




Later...

images

univ_logo.png

main_page.tex

introduction.tex

images

univ_logo.png

cover_image.png

main_page.tex

introduction.tex

first_chapter.tex

2011-10-01_images_ready 2011-09-11

time




++size

backup/

2011-09-11 [300 bytes]

2011-10-01_images_ready [228 kbytes]

2011-11-22_release [500 kbytes]

time

Sum: 728 kbytes




Changes by the time...

images

univ_logo.png

main_page.tex

introduction.tex

images

univ_logo.png

cover_image.png

main_page.tex

introduction.tex

first_chapter.tex

2011-10-01_images_ready 2011-09-11




Optimizing

images

univ_logo.png

main_page.tex

introduction.tex

2011-10-01_kepek_kesz 2011-09-11

images

univ_logo.png

cover_image.png

main_page.tex

introduction.tex

first_chapter.tex




Transparency

images

univ_logo.png

main_page.tex

introduction.tex

images

cover_image.png

main_page.tex

first_chapter.tex

2011-10-01_kepek_kesz




Transparency

images

univ_logo.png

main_page.tex

introduction.tex

images

cover_image.png

main_page.tex

first_chapter.tex

2011-10-01_kepek_kesz




Stage

images

univ_logo.png

main_page.tex

introduction.tex

2011-10-01_images_ready 2011-09-11

images

univ_logo.png

cover_image.png

main_page.txt

introduction.tex

first_chapter.tex




Commit

images

univ_logo.png

main_page.tex

introduction.tex

2011-10-01_images... 2011-09-11

images

univ_logo.png

cover_image.png

main_page.tex

introduction.tex

first_chapter.tex

TitleDateStage




Commits

List

head




Structure

head

Stage { ... // changed files }

Commit { Date date; String title; Stage * stage; Commit * parent; }

Commit * head;




Operations Stage { ... // changed files }


Commit * head;head = 0; // beginning

git_commit(Stage * stage, String title){ Commit * commit = new Commit;

commit->date = date(); commit->title = title; commit->stage = stage; commit.parent = head;

head = commit;}

head




Operations Stage { ... // changed files }


Commit * head;head = 0; // beginning

git_commit(Stage * stage, String title){ Commit * commit = new Commit;

commit->date = date(); commit->title = title; commit->stage = stage; commit.parent = head;

head = commit;}

head




Process

stage = new Stage;stage->add("/README.txt");

git_commit(stage, "init repo");

stage = new Stage;stage->add("/README.txt");stage->add("/main.cpp");

git_commit(stage, "Added main.cpp");

git init // head = 0

git add README.txt

git commit -m “init repo”

git add “README.txt”

git add “main.cpp”

git commit -m “Added main.cpp”




head




List

Directed Tree

Directed Graph<

<




Directed tree

head

Commits




Checkout

// means change the head

git_checkout(Commit * commit){ head = commit;}

git_checkout(0x45F34FE2)

head

???????




Branches

Commit * master;Commit * branch1;

git_checkout(branch1) <=> head = branch1

branch1

master

head




Tags

Commit * const tag1;Commit * const tag2;

git_checkout(tag1) <=> head = tag1

tag1 tag1




Synchronizingbranch1

master




Pickbranch1

master

branch1

git cherry-pick [commit_id]




Pickbranch1

master

branch1

git cherry-pick [commit_id]




Rebase

building new base

rebase master to branch1

branch1

master




branch1

master

git rebase branch1




branch1

master

git rebase branch1




!= branch1

master

git rebase branch1




branch1

git rebase branch1




branch1

git rebase branch1




branch1

git rebase branch1




branch1

git rebase branch1




branch1

master

git rebase branch1




Merge

branch1

master

git merge branch1




Merge

branch1

master

git merge branch1




Backup?




Backup?

PenDrive

SSH

D:\NFS




Backup?

PenDrive

SSH

D:\NFS

Amazon Storage




Sharing?




Sharing?

FTP

Samba

HTTP




List

Directed Tree

Directed Graph<

<




branch1

master

Directed Graph




branch1

master

Directed Graph




Directed Graph

bm




Directed Graph

bm

bm

bm

bm

SSHHTTP

Github

Local




Directed Graph

bm

bm

bm

bm

SSHHTTP

Github

Local




Git remote

bm

bm

bm

bm

SSHhttp

github

Local




Git remote

bm

bm

github

Local




www.github.com

bm

github



http://www.github.com

http://www.github.com


Clone

git clone [email protected]:Nucc/check.it.git

bm

githubbm






Clone

git clone [email protected]:Nucc/check.it.git

bm

github

Local

originbm






More remotes

bm

local

bm

github

bm

http

git remote -a http://nucc.balabit.hu/diploma weblap

origin

webpage



http://nucc.bteam.hu/diploma

http://nucc.bteam.hu/diploma


Operations

bm

local

bm

push

pull

github




Operations

bm

local

bm

push

pull

github

git pull origin/master




Operations

bm

local

bm

push

pull

github

git pull origin/master

git push origin master




Here and there...

bm

local

bm

backup

restore

github




Here and there...

bm

local

bm

backup

restore

github

git reset --hard origin/master




Here and there...

bm

local

bm

backup

restore

github

git reset --hard origin/master

git push -f origin master







bm

bm

bm bm

bm

bm

bm

bm

bm




bm

bm

bm bm

bm

bm

bm

bm

bm




?twitter.com/nucc



Education

Git thinking