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

1. Make the code work
for you with #Git
Tomáš Jukin
@Inza

2. Tomáš Jukin
@Inza
#Git
#RubyOnRails
#Objective-C

3. A long story short...

4. ...about a SCM tool

5. ...about a SCM tool
Source Code
Management

6. SCM?
Distributed
Centralized

7. SCM?
Distributed
Git,
Mercurial,
...
Centralized
CVS,
SVN,
...

8. Why SCM?
We NEED to share code!
...and...
FTP sucks
Mail sucks
Dropbox sucks
USB drive sucks

9. Why SCM?
We NEED to share code!
...and...
FTP sucks
Mail sucks
Dropbox sucks
USB drive sucks
So?

10. Why SCM?
Which SCM?

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?

14. Distributed SCM
By geeks around Linux Kernel
The most powerful SCM out there

15. Tools Ecosystem Rebase
Submodules Cherry-pick
GitHub Stash

16. http://git-scm.com/
http://book.git-scm.com/
http://progit.org/book/

17. Workflow
Me You

18. Workflow
Me You

19. Workflow
Me You

20. Workflow

21. Workflow
Working
Copy

22. Workflow
Working
Copy

23. Workflow
Working Local
Copy Repo

24. Workflow
Working Local
Copy Repo

25. Workflow
Working Index Local
Copy (stage) Repo

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

52. Creation (in code)
Remote Repo
mkdir foo.git
cd foo.git
git init --bare

53. Workflow (in code)
git add -a
git commit -m “Updated foo class”
git push

54. Workflow (in code)
git add -a
git commit -m “Updated foo class”
git push

55. Workflow (in code)
git pull
...or...
git fetch
git merge bar_branch

56. Installation
Windows
msysgit - http://goo.gl/YdToL
MacOS
brew install git
Linux
apt-get install git

57. GUI
Windows
TortoiseGit - http://goo.gl/9Gfhn
SmartGit - http://goo.gl/P8QqD
MacOS
GitX (L) - http://goo.gl/AMiqc
Linux
Choose yours - http://goo.gl/TebDq

58. Next?
git flow
“Just one approach to
solve branches, releases
and versions”

59. Next?
Links
Interactive Git Cheatsheet - http://goo.gl/8yMZY
GitHub - http://github.com
semver - http://semver.org
git flow (about) - http://goo.gl/MAF6m
git flow (CLI tool) - http://goo.gl/IbOJr

60. Tomáš Jukin
@Inza
@JuicymoCZ