Gitting better

1. Gitting Better

2. Gitting Better kinda

3. Hats Off Gitting Better Hello,World! Overview

4. Hats Off Gitting Better Hello,World! Overview Gitting Better Hello,World!

6. What Git is ?

7. What Git is ? NOT

8. Git is not... ... a convenient backup solution for your source code

9. Git is not... ... a convenient backup solution for your source code but

10. it

11. is

12. pretty

13. good

14. at

15. it!

16. :D

17. Git is not... ... another pain in the ass you have to deal with

18. Git is not... ... another pain in the ass you have to deal with but

19. it

20. is

21. pretty

22. good

23. at

24. it!

25. :(

26. What Git is... ... a distributed version control and source code management system.

27. What Git is... ... a distributed version control and source code management system.

28. First off, Git is a version control system, a simple command line tool for keeping a history on the state of your source code projects. You use it as you might use something like Subversion, CVS or Perforce.

29. First off, Git is a version control system, a simple command line tool for keeping a history on the state of your source code projects. You use it as you might use something like Subversion, CVS or Perforce.

30. First off, Git is a version control system, a simple command line tool for keeping a history on the state of your source code projects. You use it as you might use something like Subversion, CVS or Perforce. “cli” snapshots,

31. not

32. diffs!

33. Git allows groups of people to work on the same documents (often code) at the same time, and without stepping on each other’s toes.

34. Git allows groups of people to work on the same documents (often code) at the same time, and without stepping on each other’s toes.

35. Git allows groups of people to work on the same documents (often code) at the same time, and without stepping on each other’s toes. NO

36. MUTEX,

37. YAY!

38. You tell it to track ﬁles in your project and periodically commit the state of the project when you want a saved point. You can share that history with other developers for collaboration, merge between their work and yours, and compare or revert to previous versions of the project or individual ﬁles.

39. You tell it to track ﬁles in your project and periodically commit the state of the project when you want a saved point. You can share that history with other developers for collaboration, merge between their work and yours, and compare or revert to previous versions of the project or individual ﬁles.

40. Git is fully distributed, which means that it can work almost entirely ofﬂine. In contrast toVCS tools like Perforce or Subversion, Git does nearly all of its operations without needing a network connection, including history viewing, difference viewing and commiting. This means that Git is very fast compared to other systems partially due to the fact that none of these operations has any dependency on network latency.

41. Git is fully distributed, which means that it can work almost entirely ofﬂine. In contrast toVCS tools like Perforce or Subversion, Git does nearly all of its operations without needing a network connection, including history viewing, difference viewing and commiting. This means that Git is very fast compared to other systems partially due to the fact that none of these operations has any dependency on network latency.

42. Git is also very space efficient. It is even smaller than the Subversion checkout, which is pretty amazing, considering that the Git clone contains the entire history of the project — every version of every file back to the first commit, whereas the Subversion checkout is just the last version of the project.

43. Git is also very space efficient. It is even smaller than the Subversion checkout, which is pretty amazing, considering that the Git clone contains the entire history of the project — every version of every file back to the first commit, whereas the Subversion checkout is just the last version of the project.

44. Probably the most compelling feature of Git is Gits branching model. Instead of the popularVCS branching method of simply cloning into a separate directory for a branch, Git lets you switch between branches in a single working directory. Creating and switching between branches is nearly instant, not all of your branches need to be shared, and it’s easy to stash partially completed work.

45. Probably the most compelling feature of Git is Gits branching model. Instead of the popularVCS branching method of simply cloning into a separate directory for a branch, Git lets you switch between branches in a single working directory. Creating and switching between branches is nearly instant, not all of your branches need to be shared, and it’s easy to stash partially completed work.

46. Instead of only having branches for major development line departures, Git developers routinely create, merge and destroy multiple branches a week, or even per day. Often each feature or bug you are working on can have its own branch, merged in only when it is complete.This model allows you to experiment quickly, easily and safely - without having to go through hoops to get back to where you where. It enables and encourages a non- linear development cycle, where you can work on multiple lines of thought in parallel without them stepping on each other.

47. Instead of only having branches for major development line departures, Git developers routinely create, merge and destroy multiple branches a week, or even per day. Often each feature or bug you are working on can have its own branch, merged in only when it is complete.This model allows you to experiment quickly, easily and safely - without having to go through hoops to get back to where you where. It enables and encourages a non- linear development cycle, where you can work on multiple lines of thought in parallel without them stepping on each other.

48. As it is primarily a command line tool, most of the examples in this course will show the command line versions of the functions.

49. As it is primarily a command line tool, most of the examples in this course will show the command line versions of the functions.

50. As it is primarily a command line tool, most of the examples in this course will show the command line versions of the functions. on

52. Mac

53. :D

54. help conﬁg init add rm mv status commit log diff show branch checkout merge tag clone fetch pull push remote stash clean reset rebase bisect grep reﬂog

55. help conﬁg init add rm mv status commit log diff show branch checkout merge tag clone fetch pull push remote stash clean reset rebase bisect grep reﬂog

56. help conﬁg init add rm mv status commit log diff show branch checkout merge tag clone fetch pull push remote stash clean reset rebase bisect grep reﬂog Getting

57. Started

58. help conﬁg init add rm mv status commit log diff show branch checkout merge tag clone fetch pull push remote stash clean reset rebase bisect grep reﬂog Basic

59. stuff

60. help conﬁg init add rm mv status commit log diff show branch checkout merge tag clone fetch pull push remote stash clean reset rebase bisect grep reﬂog History

61. help conﬁg init add rm mv status commit log diff show branch checkout merge tag clone fetch pull push remote stash clean reset rebase bisect grep reﬂog Branching!

62. help conﬁg init add rm mv status commit log diff show branch checkout merge tag clone fetch pull push remote stash clean reset rebase bisect grep reﬂog Remote

63. (HUH?)

64. help conﬁg init add rm mv status commit log diff show branch checkout merge tag clone fetch pull push remote stash clean reset rebase bisect grep reﬂog advanced

65. stuff

66. help conﬁg init add rm mv status commit log diff show branch checkout merge tag clone fetch pull push remote

67. Getting Started help conﬁg

68. $ git help verb $ git verb --help Display

69. “HELP!”

70. information

71. about

72. Git

73. demo

74. $ git config --system key value $ git config --global key value $ git config --local key value Get

75. and

76. set

77. repository

78. or

79. global

80. options

81. $ git config --system key value $ git config --global key value $ git config --local key value default!

82. $ git config --global user.name “John Doe” $ git config --global user.email “johndoe@example.com”

83. demo

84. Basic Commands init, add, rm, mv, status commit

86. Working

87. Copy

88. Repository

92. $ git init Create

93. an

94. empty

95. git

96. repository

97. $ git init

98. $ git init

99. $ git init Repository Working

100. Copy

101. $ git init $ git init

102. Central

103. Repository

106. demo

107. $ git add files Add

108. new

109. or

110. modified

111. files

112. to

113. the

114. staging

115. area

117. new

118. or

119. modified

120. files

121. to

122. the

123. staging

124. area

126. new

127. or

128. modified

129. files

130. to

131. the

132. staging

133. area (a.k.a.

134. “index”

135. or

136. “cache”)

137. Now Pay Attention! The Three States

138. This is the main thing to remember about Git if you want the rest of your learning process to go smoothly. Git has three main states that your ﬁles can reside in: committed, modiﬁed, and staged.

139. This is the main thing to remember about Git if you want the rest of your learning process to go smoothly. Git has three main states that your ﬁles can reside in: committed, modiﬁed, and staged. 1 2 3

140. Committed means that the data is safely stored in your local database. Modified means that you have changed the file but have not committed it to your database yet. Staged means that you have marked a modified file in its current version to go into your next commit snapshot.

145. Staging Area

146. Staging Area Stage ﬁles

147. Staging Area Stage ﬁles Commit

148. Working Copy Staging Area Repository git add$ Add

149. new

150. or

151. modified

152. files

153. to

154. the

155. staging

156. area files

157. Remove

158. files

159. from

160. the

161. working

162. directory and

163. staging

164. area git rm$ files Working Copy Staging Area Repository

165. Move

166. or

167. rename

168. a

169. file,

170. or

171. a

172. directory git mv$ source destination Working Copy Staging Area Repository

173. demo

174. $ git status Show

175. the

176. status

177. of

178. the

179. working

180. directory and

181. staging

182. area

183. demo

184. $ git commit Record

185. changes

186. to

187. the

188. repository

190. Staging Area

191. $ echo “Hello, World!” hello.txt Staging Area

192. $ echo “Hello, World!” hello.txt $ git add hello.txt Staging Area Stage ﬁles

193. $ echo “Hello, World!” hello.txt $ git add hello.txt $ git commit --message “Initial commit.” Staging Area Stage ﬁles initialcommit Commit

194. demo

195. History Commands log, diff show

196. History Commands log, diff show Before

197. to

198. get

199. there, let’s

200. talk

201. about

202. references

203. (or

204. “refs”)

206. SHA: 1a410efbd13591db07496601ebc7a059dd55cfe9 Author: John Doe johndoe@example.com Date: Fri Jun 21 06:00:26 2013 -0700

209. human-readable-name wouldn’t

210. that

211. be

212. awesome?

213. tags branches remotes human-readable-name

214. HEAD symbolic

215. reference

216. to where

217. you

218. are

219. pointing

220. at right

221. now

222. something A

223. tree

224. is

225. “lost”

226. without

227. a symbolic

228. reference

229. to

230. it!!! something-else

231. something A

232. tree

233. is

234. “lost”

235. without

236. a symbolic

237. reference

238. to

239. it!!! This

240. is

241. not

242. true

243. actually, but

244. that’s

245. advanced

246. stuff

247. History Commands log, diff show

248. $ git log Show

249. the

250. commit

251. history

252. log

253. $ git diff Show

254. changes

255. between

256. commits,

257. commit

258. and

259. working

260. tree,

261. etc

262. $ git show Show

263. information

264. about

265. commits,

266. tags

267. or

268. files

269. demo

270. Branching Commands branch, checkout, merge tag

271. without branches

273. HEAD

274. HEAD

275. HEAD

276. HEAD

277. HEAD

278. HEAD

279. HEAD

280. HEAD

281. without branches thinking

282. about

284. HEADmaster

285. HEADmaster

286. HEADmaster

287. HEADmaster

288. HEADmaster

289. HEADmaster

290. HEADmaster

291. HEADmaster

292. with branches (a

293. typical

294. Git

295. day)

297. HEADmaster

298. HEADmaster

299. HEADmaster

300. HEADanything Renamed

301. HEADanything

302. HEADanything cool-feature A

303. brand

304. new

305. branch!

306. HEAD anything cool-feature

308. HEADanything cool-feature Switch

309. to

310. another

311. branch...

314. HEADanything cool-feature

315. HEAD anything cool-feature Merged

316. anything cool-feature HEAD

317. anything cool-featureHEAD

318. anything mainHEAD

319. anything main HEAD

320. anything main HEAD

321. v0.0.1 anything main HEAD Tag

322. things.

323. anything main HEAD v0.0.1

324. anything main HEAD Pretty

325. much anything

326. you

327. want v0.0.1

328. $ git branch List,

329. create,

330. or

331. delete

332. branches

333. $ git checkout Switch

334. the

335. active

336. branch

337. to

338. another

339. branch

340. $ git merge Join

341. two

342. or

343. more

344. development histories

345. (branches)

346. together

347. $ git tag Create,

348. list,

349. delete,

350. sign

351. or verify

352. a

353. tag

354. object

355. demo

356. Remote Commands remote, fetch, pull, push clone

359. Matteo

360. Matteo Fabio

361. Fabio Matteo ﬁle:// ssh:// git:// http:// https:// ⋮

363. WTF?!

368. $ git remote View

369. and

370. manage

371. a

372. set

373. of

374. remote

375. repositories

376. $ git fetch Download

377. data,

378. tags

379. and

380. branches

381. from a

382. remote

383. repository

384. $ git pull Fetch

385. from

386. and

387. merge

388. with

389. another

390. repository

391. or

392. a

393. local

394. branch

395. $ git pull Fetch

396. from

397. and

398. merge

399. with

400. another

401. repository

402. or

403. a

404. local

405. branch

406. $ git push Upload

407. data,

408. tags

409. and

410. branches

411. to a

412. remote

413. repository

414. $ git clone Clone

415. a

416. remote

417. repository

418. into a

419. new

420. directory

421. demo

423. Matteo Fabio

424. A

425. teammate

426. that never

427. sleeps!

430. demo

431. References • git-scm.com • gitref.org

432. Useful Resources • try.github.io • learn.github.com • teach.github.com • training.github.com

Gitting better

Recommandé

Recommandé

Contenu connexe

Tendances

Tendances (20)

En vedette

En vedette (13)

Similaire à Gitting better

Similaire à Gitting better (20)

Dernier

Dernier (20)

Gitting better