1. Git - Step by step

2. Goal
We would like to make snapshots
of the university thesis.
Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

3. Thesis
images/
univ_logo.png
main_page.tex
introduction.tex
Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

4. 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
Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

5. 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
first_chapter.tex
Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

6. ++size
backup/
2011-09-11 [300 bytes]
time
2011-10-01_images_ready [228 kbytes]
2011-11-22_release [500 kbytes]
Sum: 728 kbytes
Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

7. Changes by the 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
first_chapter.tex
Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

8. Optimizing
2011-09-11 2011-10-01_kepek_kesz
images images
univ_logo.png univ_logo.png
cover_image.png
main_page.tex main_page.tex
introduction.tex introduction.tex
first_chapter.tex
Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

9. Transparency
2011-10-01_kepek_kesz
images images
univ_logo.png
cover_image.png
main_page.tex main_page.tex
introduction.tex
first_chapter.tex
Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

10. Transparency
2011-10-01_kepek_kesz
images
univ_logo.png
cover_image.png
main_page.tex
introduction.tex
first_chapter.tex
Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

11. Stage
2011-09-11 2011-10-01_images_ready
images images
univ_logo.png univ_logo.png
cover_image.png
main_page.tex main_page.txt
introduction.tex introduction.tex
first_chapter.tex
Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

12. Commit Stage Date Title
2011-09-11 2011-10-01_images...
images images
univ_logo.png univ_logo.png
cover_image.png
main_page.tex main_page.tex
introduction.tex introduction.tex
first_chapter.tex
Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

13. Commits
head
List
Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

14. Structure
Stage {
... // changed files
}
Commit {
Date date;
String title;
Stage * stage;
Commit * parent;
}
Commit * head;
head
Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

15. Operations Stage {
... // changed files
}
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;
}
Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

16. Operations Stage {
... // changed files
}
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
Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

17. 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”
Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

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

19. List
<
Directed Tree
Directed Graph <
Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

20. Commits
head
Directed tree
Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

21. Checkout
// means change the head
git_checkout(Commit * commit)
{
head = commit; head
}
git_checkout(0x45F34FE2)
???????
Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

22. Branches
head
Commit * master;
Commit * branch1;
branch1
git_checkout(branch1) <=> head = branch1
master
Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

23. Tags
Commit * const tag1;
Commit * const tag2;
git_checkout(tag1) <=> head = tag1
tag1 tag1
Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

24. Synchronizing
branch1
master
Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

25. Pick
branch1
master
git cherry-pick [commit_id]
Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

26. Pick
branch1
master
git cherry-pick [commit_id]
Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

27. Rebase
branch1
master
building new base
rebase master to branch1
Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

28. branch1
master
git rebase branch1
Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

29. branch1
master
git rebase branch1
Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

30. != branch1
master
git rebase branch1
Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

31. branch1
git rebase branch1
Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

32. branch1
git rebase branch1
Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

33. branch1
git rebase branch1
Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

34. branch1
git rebase branch1
Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

35. branch1
master
git rebase branch1
Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

36. Merge
branch1
master
git merge branch1
Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

37. Merge
branch1
master
git merge branch1
Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

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

39. Backup?
PenDrive
D:
NFS
SSH
Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

40. Backup?
PenDrive
D:
NFS
SSH
Amazon Storage
Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

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

42. Sharing?
HTTP
Samba
FTP
Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

43. List
<
Directed Tree
Directed Graph <
Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

44. Directed Graph
branch1
master
Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

45. Directed Graph
branch1
master
Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

46. Directed Graph
b
m
Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

47. Directed Graph
HTTP
SSH b
b m
m
Local
b
m
b
m
Github
Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

48. Directed Graph
HTTP
SSH b
b m
m
Local
b
m
b
m
Github
Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

49. Git remote
http
SSH b
b m
m
Local
b
m
b
m
github
Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

50. Git remote
Local
b
m
b
m
github
Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

51. www.github.com
b
m
github
Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

52. Clone
b
m
github
git clone git@github.com:Nucc/check.it.git
Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

53. Clone
Local
b origin b
m m
github
git clone git@github.com:Nucc/check.it.git
Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

54. More remotes
http
b
m
webpage
local
github
b origin b
m m
git remote -a http://nucc.balabit.hu/diploma weblap
Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

55. Operations
local github
push
b b
m pull m
Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

56. Operations
local github
push
b b
m pull m
git pull origin/master
Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

57. Operations
git push origin master
local github
push
b b
m pull m
git pull origin/master
Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

58. Here and there...
local github
backup
b b
m restore m
Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

59. Here and there...
local github
backup
b b
m restore m
git reset --hard origin/master
Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

60. Here and there...
git push -f origin master
local github
backup
b b
m restore m
git reset --hard origin/master
Balabit Open Academy, Veszprém, Nov 30, 2011 twitter.com/nucc

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

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

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

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