Git thinking

Goal

We would like to make snapshots
of the university thesis.

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

Thesis

images/

univ_logo.png

main_page.tex

introduction.tex


Create backup

images backup

univ_logo.png copy 2011-09-11

main_page.tex 2011-10-01_images_ready

introduction.tex 2011-11-22_release


Later...
time

2011-09-11 2011-10-01_images_ready

images images

univ_logo.png univ_logo.png

main_page.tex cover_image.png

introduction.tex main_page.tex

introduction.tex

ﬁrst_chapter.tex


++size

backup/

2011-09-11 [300 bytes]
time
2011-10-01_images_ready [228 kbytes]

2011-11-22_release [500 kbytes]

Sum: 728 kbytes


Changes by the time...
2011-09-11 2011-10-01_images_ready

images images


main_page.tex cover_image.png

introduction.tex main_page.tex

introduction.tex

ﬁrst_chapter.tex


Optimizing
2011-09-11 2011-10-01_kepek_kesz

images images


cover_image.png

main_page.tex main_page.tex

introduction.tex introduction.tex

ﬁrst_chapter.tex


Transparency
2011-10-01_kepek_kesz

images images

univ_logo.png

cover_image.png


introduction.tex

ﬁrst_chapter.tex


Transparency
2011-10-01_kepek_kesz

images

univ_logo.png

cover_image.png

main_page.tex

introduction.tex

ﬁrst_chapter.tex


Stage
2011-09-11 2011-10-01_images_ready

images images


cover_image.png

main_page.tex main_page.txt


ﬁrst_chapter.tex


Commit Stage Date Title

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

images images


cover_image.png



ﬁrst_chapter.tex


Commits

head

List


Structure
Stage {
... // changed files
}

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

Commit * head;
head


Operations Stage {
}

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

head = 0; // beginning Commit * head;

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

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


Operations Stage {
}

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

head = 0; // beginning Commit * head;

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

git init // head = 0
stage = new Stage;
stage->add("/README.txt");
git add README.txt
git_commit(stage, "init repo");
git commit -m “init repo”

stage = new Stage;
git add “README.txt”
stage->add("/README.txt");
stage->add("/main.cpp");
git add “main.cpp”
git_commit(stage, "Added main.cpp");
git commit -m “Added main.cpp”


head


List

<
Directed Tree

Directed Graph <


Commits
head

Directed tree


Checkout
// means change the head

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

git_checkout(0x45F34FE2)

???????


Branches
head
Commit * master;
Commit * branch1;
branch1
git_checkout(branch1) <=> head = branch1

master


Tags

Commit * const tag1;
Commit * const tag2;

git_checkout(tag1) <=> head = tag1

tag1 tag1


Synchronizing
branch1

master


Pick
branch1

master

git cherry-pick [commit_id]


Rebase
branch1

master

building new base
rebase master to branch1


branch1

master

git rebase branch1


!= branch1

master

git rebase branch1


branch1

git rebase branch1


Merge
branch1

master

git merge branch1


Backup?


Backup?
PenDrive
D:
NFS

SSH


Backup?
PenDrive
D:
NFS

SSH
Amazon Storage


Sharing?


Sharing?

HTTP
Samba

FTP


Directed Graph
branch1

master


Directed Graph

branch1

master


Directed Graph

b
m


Directed Graph
HTTP
SSH b
b m
m

Local
b
m
b
m
Github


Git remote
http
SSH b
b m
m

Local
b
m
b
m
github


Git remote

Local
b
m
b
m
github


www.github.com

b
m
github


Clone

b
m
github

git clone git@github.com:Nucc/check.it.git


Clone

Local
b origin b
m m
github

git clone git@github.com:Nucc/check.it.git


More remotes
http
b
m
webpage
local
github
b origin b
m m

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

Operations

local github
push
b b
m pull m


Operations

local github
push
b b
m pull m

git pull origin/master


Operations

git push origin master

local github
push
b b
m pull m

git pull origin/master


Here and there...

local github
backup
b b
m restore m


Here and there...

local github
backup
b b
m restore m

git reset --hard origin/master


Here and there...

git push -f origin master

local github
backup
b b
m restore m

git reset --hard origin/master


b
m
b
m
b
m b
b m
b
m m

b
m
b
m
b
m


?
twitter.com/nucc


Git thinking

Recomendados

Recomendados

Más contenido relacionado

Último

Último (20)

Destacado

Destacado (20)

Git thinking