Git and Github

Transcript

1. 1.

   Git and Github eddiekao@NCKU

2. 2.

   None
3. 3.

   Current Status 80% iOS app, 20% Ruby/Rails

4. 4.

   Before we start..

5. 5.

   You may create lots of files day by day..

6. 6.

   edit them, save, edit them, and save.. x N

7. 7.

   Backup?

8. 8.

   Ctrl-C + Ctrl-V

9. 9.

   "ProjectA" -> "ProjectA20130506" -> "ProjectA20130508-1" -> "ProjectA20130508-2" -> "ProjectA-bak" ->

   "ProjectA-forEddie"
10. 10.

    backup and sync on LAN

11. 11.

    Version Control

12. 12.

    Subversion (SVN)

13. 13.

    but the problem is..

14. 14.

    when network or svn server is down..

15. 15.

    Is there any better way..?

16. 16.

    Git

17. 17.

    What's Git?

18. 18.

    Version Control System (VCS)

19. 19.

    created by Linus Torvalds for managing Linux kernel source code

    in 2005
20. 20.

    distributed

21. 21.

    remote, and also local

22. 22.

    Git

23. 23.

    Git != Github

24. 24.

    Why version control?

25. 25.

    backup just like you can load saving data while playing

    RPG game
26. 26.

    history and evidence you know whom to blame when something

    is going wrong :)
27. 27.

    Why Git?

28. 28.

    free

29. 29.

    fast & smaller footprint

30. 30.

    http://git-scm.com/book/en/Getting-Started-Git-Basics some other version control system..

31. 31.

    http://git-scm.com/book/en/Getting-Started-Git-Basics git

32. 32.

    just snapshots, not differences

33. 33.

    local commit and remote push

34. 34.

    most of the operations are local

35. 35.

    easy to co-work with others

36. 36.

    But..

37. 37.

    git is easy to use, but hard to master

38. 38.

    Install Git

39. 39.

    on Mac: > brew install git on Ubuntu or some

    linux OS: > sudo apt-get install git-core or > sudo apt-get install git
40. 40.

    Exercise: please install git in your machine.

41. 41.

    How to Git

42. 42.

    configurations

43. 43.

    .gitconfig it should locate in your home directory

44. 44.

    set your username and email > git config --global user.name

    "eddie" > git config --global user.email "eddie@digik.com.tw" list all settings > git config --list
45. 45.

    make some useful aliases

46. 46.

    [alias] co = checkout br = branch aa = add

    --all l = "!source ~/.dotfiles/.githelper && pretty_git_log" https://github.com/kaochenlong/eddie-dotfiles
47. 47.

    Exercise: 1. set your username and email for git. 2.

    edit the ".gitconfig" and add some aliases.
48. 48.

    .gitignore https://github.com/github/gitignore

49. 49.

    don't be afraid of command line tools

50. 50.

    git init

51. 51.

    Exercise: please create a new directory and initialize for git

    version control.
52. 52.

    git clone

53. 53.

    git clone git://github.com/kaochenlong/eddie-vim.git

54. 54.

    Exercise: please try to copy a project from Github or

    somewhere to your local machine.
55. 55.

    working, staging, and repository

56. 56.

    http://git-scm.com/about/staging-area

57. 57.

    git add can add a single file or all modified

    files, even a single line.
58. 58.

    Exercise: add a new file named "hello.rb" and add to

    staging area.
59. 59.

    Exercise: after adding "hello.rb" to staging area, then try to

    modify it and see what happen?
60. 60.

    git status

61. 61.

    Exercise: try to check if "hello.rb" is in staging area,

    and then remove it from staging area.
62. 62.

    git mv

63. 63.

    Exercise: add "hello.rb" to staging area, and then rename it

    to "world.rb".
64. 64.

    git commit

65. 65.

    Exercise: just commit it :)

66. 66.

    When to make a Commit?!

67. 67.

    commit message matters!

68. 68.

    amend committed message

69. 69.

    git commit --amend

70. 70.

    Exercise: you just committed with a rubbish message, pleases amend

    it to make sense for your project.
71. 71.

    Exercise: in last commit, you forgot to add another file,

    but you don't want to commit again just for this single file, please try to commit it with -- amend.
72. 72.

    Notice: empty folder won't be committed!

73. 73.

    if you still want to commit an empty folder, you

    can put an empty “.gitkeep” file in it by convention.
74. 74.

    git log

75. 75.

    git log --pretty=oneline

76. 76.

    git log --pretty=format:"%h %s"

77. 77.

    git help log

78. 78.

    Exercise: check your commit log

79. 79.

    Exercise: read the help manual of “git log”, and make

    your prefer log format.
80. 80.

    Exercise: modify something in the "world.rb" then commit again.

81. 81.

    git rm

82. 82.

    Exercise: remove a file and then checkout it back.

83. 83.

    git tag

84. 84.

    tag is a milestone

85. 85.

    Exercise: create a tag for your project

86. 86.

    git branch

87. 87.

    branching is very cheap

88. 88.

    When to make a Branch?!

89. 89.

    git checkout

90. 90.

    Exercise: 1. create a new branch name "fruit" 2. checkout

    to "fruit" branch 3. add a "banana.rb" and commit it
91. 91.

    Exercise: please try to list all branches, including local and

    remote branches.
92. 92.

    Exercise: you accidentally delete the "world.rb" file, please try to

    recover it with git commands.
93. 93.

    Exercise: you just create a tag name “ncku”, try to

    checkout to this tag after several commits.
94. 94.

    git merge

95. 95.

    conflict?

96. 96.

    Exercise: 1. checkout back to "master" branch 2. merge "fruit"

    to "master" 3. remove "fruit" branch if you like
97. 97.

    git reset soft v.s. hard

98. 98.

    Exercise: reset a file to untracked status which you just

    added to staging.
99. 99.

    Exercise: you just merged a branch, please try reset it

    to back to un-merged branch.
100. 100.

     git pull

101. 101.

     git pull = git fetch + git merge

102. 102.

     git push

103. 103.

     git push origin ncku-branch

104. 104.

     git clean remove untracked files

105. 105.

     git stash apply, pop, list, clear

106. 106.

     git remote

107. 107.

     Reading References

108. 108.

     1. Pro Git 2. ihower's blog http://ihower.tw/git/

109. 109.

     Git Flow

110. 110.

     http://git-scm.com/book/en/Git-Branching-Branching-Workflows

111. 111.

     http://nvie.com/posts/a-successful-git-branching-model/

112. 112.

     on Mac: > brew install git-flow on Ubuntu or some

     linux OS: > sudo apt-get install git-flow https://github.com/nvie/gitflow/wiki/Installation
113. 113.

     Exercise: please install git flow in your machine, and initialize

     a git flow project.
114. 114.

     init a project with git flow > git flow init

115. 115.

     Branches Master, Develop, Feature, Release, Hotfix

116. 116.

     add a new feature: > git flow feature start my_new_feature

     when done with the new feature: > git flow feature finish my_new_feature
117. 117.

     Exercise: your boss ask you to add a new feature

     which can let user upload their photos, please try to finish this assignment in git flow.
118. 118.

     Exercise: your boss find a bug and ask you to

     fix it ASAP, please try to do this assignment in git flow.
119. 119.

     Github

120. 120.

     What's Github?

121. 121.

     a git repository server

122. 122.

     coders' facebook :)

123. 123.

     None
124. 124.

     make friends with other awesome coders :)

125. 125.

     resume for coders!

126. 126.

     Free? Price?

127. 127.

     SSH/HTTPS/GIT

128. 128.

     How to Github?

129. 129.

     Exercise: register a new account on Github

130. 130.

     without password?

131. 131.

     SSH Key

132. 132.

     Exercise: generate a SSH key pair in your local machine

     and add the public key to Github
133. 133.

     Exercise: create a new repository on Github

134. 134.

     git push

135. 135.

     Exercise: upload your project to Github

136. 136.

     Exercise: 1. clone a project from Github 2. do some

     changes 3. commit and push back to Github
137. 137.

     Exercise: 1. create a new local branch 2. add some

     change and then push this branch to Github
138. 138.

     tag won't be pushed to repo by default

139. 139.

     push a tag: > git push origin v2.0 push several

     tags: > git push origin --tags
140. 140.

     Exercise: create some tags for your project and upload them

     to Github
141. 141.

     git pull

142. 142.

     Fork

143. 143.

     Pull Request

144. 144.

     Exercise: 1. fork a project from your classmate who is

     sitting just next to you. 2. add some change and commit. 3. fire a pull request.
145. 145.

     Github Pages

146. 146.

     host static files for FREE

147. 147.

     upload files via git commands

148. 148.

     User pages kaochenlong.github.io

149. 149.

     Project Pages gh-pages branch

150. 150.

     custom domain name

151. 151.

     Exercise: 1. create a github page for your account. 2.

     set your domain name in CNAME if you have one.
152. 152.

     something else?

153. 153.

     bitbucket free private repo

154. 154.

     git + dropbox

155. 155.

     What's inside the .git folder?