Version Control With Git

Transcript

1. Version Control with @PascalPrecht

2. @PascalPrecht • Web Application Developer • Speaker • Evangelist •

   Vim Lover
3. None

4. git-scm.com

5. git-scm.com/book

6. gitref.org

7. gitimmersion.com

8. What is Git?

9. What is Git? • VCS (Version Control System) • Open

   Source • Fully Distributed • Local • Fast!

10. Git Basics

11. Centralized VCS http://git-scm.com/figures/18333fig0102-tn.png

12. Distributed VCS http://git-scm.com/figures/18333fig0103-tn.png

13. Working offline • Performing a diff • Viewing file history

    • Committing changes • Merging branches • Obtaining other revisions of a file • Switching branches

14. Diffs http://git-scm.com/figures/18333fig0104-tn.png

15. Snapshots http://git-scm.com/figures/18333fig0105-tn.png

16. Integrity • Content is check-summed before it is stored •

    SHA-1 Hash (40 hexadecimal characters)

17. 24b9223f34a90c90353359dd649e99e23246ab2c

18. The Flow http://git-scm.com/figures/18333fig0106-tn.png

19. Let’s see how it works (demo)

20. Configuration

21. Configuration • git config --global user.name “Pascal Precht” • git

    config --global user.email “[email protected]”

22. The Flow

23. The Flow • init / clone • edit • add

    • status / diff • commit

24. The Flow http://git-scm.com/figures/18333fig0201-tn.png

25. Getting a repo • git init • creates a new

    repository • git clone • clones an existing repository (via ssh, http, file, git ...)

26. Commit anatomy http://git-scm.com/figures/18333fig0301-tn.png

27. Branching

28. http://git-scm.com/figures/18333fig0301-tn.png

29. http://git-scm.com/figures/18333fig0302-tn.png

30. http://git-scm.com/figures/18333fig0303-tn.png

31. git branch testing

32. http://git-scm.com/figures/18333fig0304-tn.png

33. http://git-scm.com/figures/18333fig0305-tn.png

34. git checkout testing

35. http://git-scm.com/figures/18333fig0306-tn.png

36. http://git-scm.com/figures/18333fig0307-tn.png

37. git checkout master

38. http://git-scm.com/figures/18333fig0308-tn.png

39. http://git-scm.com/figures/18333fig0309-tn.png

40. Merging

41. http://git-scm.com/figures/18333fig0310-tn.png

42. http://git-scm.com/figures/18333fig0311-tn.png

43. http://git-scm.com/figures/18333fig0312-tn.png

44. http://git-scm.com/figures/18333fig0313-tn.png

45. git merge hotfix

46. Fast Forward Merge

47. http://git-scm.com/figures/18333fig0314-tn.png

48. http://git-scm.com/figures/18333fig0315-tn.png

49. git merge iss53

50. Three-Way Merge

51. http://git-scm.com/figures/18333fig0316-tn.png

52. http://git-scm.com/figures/18333fig0317-tn.png

53. Remotes

54. Demo

55. Bare Repositories • Not a working directory • May exist

    on the same maschine • push / pull

56. git pull [remote] [branchname]

57. git fetch [remote] followed by git merge FETCH_HEAD Behind the

    scenes

58. Who uses Git?

59. http://www.linux-mag.com/s/i/topics/tux.jpg

60. http://assets.warpspire.com/images/github/octocat.png

61. Thanks! Twitter: @PascalPrecht Blog: hopelessart.com Slides: speakerdeck.com/u/pascalprecht/p/version- control-with-git