Git For Humans - Holiday Extras - 14/08/2015

Transcript

1. 1.

   git for humans

2. 2.

   What is git

3. 3.

   Git is a free and open source distributed version control

   system designed to handle everything from small to very large projects with speed and efficiency. http://git-scm.com/
4. 4.

   Git is a free and open source distributed version control

   system designed to handle everything from small to very large projects with speed and efficiency. http://git-scm.com/
5. 5.

   Version Control System (VCS)

6. 6.

   Source Control Management (SCM)

7. 7.

   collection of files

8. 8.

   every change tracked

9. 9.

   who

10. 10.

    when

11. 11.

    why

12. 12.

    Mostly used for code

13. 13.

    Why do we use it

14. 14.

    simultaneous working

15. 15.

    easy to rollback

16. 16.

    multiple backups multiple locations

17. 17.

    Terminology

18. 18.

    Setting Up

19. 19.

    Repo (Repository)

20. 20.

    files & history

21. 21.

    None
22. 22.

    $ git init

23. 23.

    Remote

24. 24.

    None
25. 25.

    $ git remote

26. 26.

    origin sandbox production

27. 27.

    origin sandbox production

28. 28.

    Clone

29. 29.

    None
30. 30.

    None
31. 31.

    $ git clone {url}

32. 32.

    None
33. 33.

    None
34. 34.

    $ git remote add {alias} {url}

35. 35.

    Git is a free and open source distributed version control

    system designed to handle everything from small to very large projects with speed and efficiency.
36. 36.

    Centralised

37. 37.

    Distributed

38. 38.

    Starting Your Work

39. 39.

    Branch

40. 40.

    $ git checkout {branch}

41. 41.

    $ git checkout -b {branch}

42. 42.

    master

43. 43.

    master cool-thing

44. 44.

    $ git checkout -b cool-thing

45. 45.

    master cool-thing

46. 46.

    master cool-thing

47. 47.

    $ git checkout -

48. 48.

    $ git fetch

49. 49.

    Submitting Changes

50. 50.

    Diff

51. 51.

    $ git diff

52. 52.

    - I removed this + and added this

53. 53.

    $ git add -p

54. 54.

    Stage

55. 55.

    $ git add {file}

56. 56.

    $ git status

57. 57.

    $ git add .

58. 58.

    Commit

59. 59.

    $ git commit -m “{message}”

60. 60.

    Push

61. 61.

    $ git push {remote} {branch}

62. 62.

    $ git push {remote} {branch}:{remote- branch}

63. 63.

    Do some codings Stage changes Commit changes Push to remote

    In History Not In History
64. 64.

    Staying Up-to-date

65. 65.

    Pull

66. 66.

    $ git pull {remote} {branch}

67. 67.

    Merge

68. 68.

    master cool-thing

69. 69.

    master cool-thing

70. 70.

    $ git merge {branch}

71. 71.

    Rebase

72. 72.

    master cool-thing

73. 73.

    master cool-thing

74. 74.

    $ git rebase {branch}

75. 75.

    Conflicts

76. 76.

    <<<<<<< HEAD my code ======= someone else’s code >>>>>>> master

77. 77.

    Merge/Rebase Resolve Conflicts Stage Commit

78. 78.

    Rolling Back

79. 79.

    Before Staging

80. 80.

    $ git checkout {file}

81. 81.

    $ git checkout .

82. 82.

    Once Staged

83. 83.

    Reset

84. 84.

    $ git reset

85. 85.

    $ git reset --hard

86. 86.

    Once Committed

87. 87.

    Revert

88. 88.

    $ git revert {commit}

89. 89.

    $ git log

90. 90.

    commit abcdefghijklmnop Author: joeblogg <joe.bloggs@website.com> Date: Fri Aug 7 13:19:34

    2015 +0100 My super awesome change
91. 91.

    commit abcdefghijklmnop Author: joeblogg <joe.bloggs@website.com> Date: Fri Aug 7 13:19:34

    2015 +0100 My super awesome change
92. 92.

    Questions?