Slides from my presentation on Java BootCamp #5 about Git.
Java BootCamp #5 took place in Hradec Králové at 8. 11. 2012
http://www.java-bootcamp.cz/cs/bootcamp-5
11. Which SCM? be independant
Today, we NEED to: be productive
work offline
...and... have backup
grow
CVS is a history
SVN is centralized
Mercurial can’t rebase
...
12. Which SCM? be independant
Today, we NEED to: be productive
work offline
...and... have backup
grow
CVS is a history
SVN is centralized
Mercurial can’t rebase
... So?
26. Workflow Local Remote
Working Index Local
Copy (stage) Repo
27. Workflow Local Remote
Working Index Local
Copy (stage) Repo
28. Workflow Local Remote
Working Index Local Remote
Copy (stage) Repo Repo
29. Workflow Local Remote
Working Index Local Remote
Copy (stage) Repo Repo
30. Workflow Local Remote
add
Working Index Local Remote
Copy (stage) Repo Repo
31. Workflow Local Remote
add
Working Index Local Remote
Copy (stage) Repo Repo
32. Workflow Local Remote
add commit
Working Index Local Remote
Copy (stage) Repo Repo
33. Workflow Local Remote
add commit
Working Index Local Remote
Copy (stage) Repo Repo
34. Workflow Local Remote
add commit push
Working Index Local Remote
Copy (stage) Repo Repo
35. Workflow Local Remote
add commit push
Working Index Local Remote
Copy (stage) Repo Repo
36. Workflow Local Remote
add commit push
Working Index Local fetch
Remote
Copy (stage) Repo Repo
37. Workflow Local Remote
add commit push
Working Index Local fetch
Remote
Copy (stage) Repo Repo
38. Workflow Local Remote
add commit push
Working Index merge
Local fetch
Remote
Copy (stage) Repo Repo
39. Workflow Local Remote
add commit push
Working Index merge
Local fetch
Remote
Copy (stage) Repo Repo
40. Workflow Local Remote
add commit push
Working Index merge
Local fetch
Remote
Copy (stage) Repo Repo
pull or rebase
41. Workflow Local Remote
add commit push
Working Index merge
Local fetch
Remote
Copy (stage) Repo Repo
pull or rebase
42. Workflow checkout HEAD
Local Remote
add commit push
Working Index merge
Local fetch
Remote
Copy (stage) Repo Repo
pull or rebase
43. Workflow checkout HEAD
Local Remote
add commit push
Working Index merge
Local fetch
Remote
Copy (stage) Repo Repo
pull or rebase
44. Workflow checkout HEAD
Local Remote
add commit push
Working remove Index merge
Local fetch
Remote
Copy (stage) Repo Repo
pull or rebase
45. Workflow checkout HEAD
Local Remote
add commit
push
Working remove Index merge
Local fetch
Remote
Copy (stage) Repo Repo
pull or rebase
46. Workflow checkout HEAD
Local Remote
add commit
push
commit -a
Working remove Index merge
Local fetch
Remote
Copy (stage) Repo Repo
pull or rebase
47. Workflow checkout HEAD
Local Remote
add
commit
push
add -A
commit -a
Working remove Index merge
Local fetch
Remote
Copy (stage) Repo Repo
pull or rebase
48. Workflow checkout HEAD
Local Remote
add
commit
push
add -A
commit -a
Working remove Index merge
Local fetch
Remote
Copy (stage) Repo Repo
?
pull or rebase
49. Workflow checkout HEAD
Local Remote
add
commit
push
add -A
commit -a
Working remove Index merge
Local fetch
Remote
Copy (stage) Repo Repo
? status
pull or rebase
50. Creation (in code)
Local Repo
git clone git@repo.foo.com/foo.git foo_dir
cd foo_dir
...or...
mkdir foo_dir
cd foo_dir
git init
51. Creation (in code)
clone url Local Repo
git clone git@repo.foo.com/foo.git foo_dir
cd foo_dir
...or...
mkdir foo_dir
cd foo_dir
git init