Git 1 2 3

A quick introduction to git

Transcript

1. Git 1 2 3! A fast introduction to git for professionals Jordan Schatz jordan@noionlabs.com You can fork this presentation at: https://github.com/shofetim/git-1-2-3 1
2. 1: What is Git? 2
3. What is Git? Git is: + a source code management tool + distributed + fast 3
4. What is Git? Linus Torvolds wrote Git to solve a problem + All existing version control systems where broken + There where about 30,000 developers working on the kernel which made other VCS painful to use + He needed something that made his work faster 4
5. Solution: Git 5
6. Quick Note Why the name ’git’ ? Quoting Linus: "I’m an egotistical ***, and I name all my projects after myself. First ’Linux’, now ’git’" 6
7. What is Git good for? Git is a Source Code Management system, not a version control system. 7
8. What is Git good for? Git is a Source Code Management system, not a version control system. + Efficient Sharing 8
9. What is Git good for? Git is a Source Code Management system, not a version control system. + Efficient Sharing + Code Review 9
10. What is Git good for? Git is a Source Code Management system, not a version control system. + Efficient Sharing + Code Review + Documentation 10
11. What is Git good for? Git is a Source Code Management system, not a version control system. + Efficient Sharing + Code Review + Documentation + Security / Integrity 11
12. What is Git good for? Git is a Source Code Management system, not a version control system. + Efficient Sharing + Code Review + Documentation + Security / Integrity + Versioning 12
13. What is Git good for? Git is a Source Code Management system, not a version control system. + Efficient Sharing + Code Review + Documentation + Security / Integrity + Versioning + Debugging 13
14. What is Git good for? Git is a Source Code Management system, not a version control system. + Efficient Sharing + Code Review + Documentation + Security / Integrity + Versioning + Debugging + A simple continuous integration server 14
15. What is Git good for? Git is a Source Code Management system, not a version control system. + Efficient Sharing + Code Review + Documentation + Security / Integrity + Versioning + Debugging + A simple continuous integration server + more cool tools 15
16. The single most important thing you get is that: Experimentation Is Inexpensive 16
17. Stop pussyfooting around your codebase... and start striding around like a giant 17
18. Aside You don’t have to just use git for source code 18
19. Types of code that I use git for: + Ledger https://github.com/jwiegley/ledger 19
20. Types of code that I use git for: + Emacs Org mode http://orgmode.org/ Appointments Notes Project management Time logs Passwords Project Proposals Research papers Code documentation 20
21. Types of code that I use git for: + Calendar http://www.roaringpenguin.com/products/remind 21
22. Types of code that I use git for: + Diagrams http://ditaa.sourceforge.net/ 22
23. Types of code that I use git for: + Presentations http://docs.racket-lang.org/slideshow/index.html 23
24. Types of code that I use git for: + Just about everything else too 24
25. 2: Get Git 25
26. Where to get it? Git http://git-scm.com/ Linux Mac Windows 26
27. How it works + Commits 27
28. How it works + Commits + sha1 28
29. How it works + Commits + sha1 (sha1 (open-input-string "hello world")) "2aae6c35c94fcfb415dbe95f408b9ce91ee846ed" 29
30. How it works + Commits + sha1 (sha1 (open-input-string "hello world")) "2aae6c35c94fcfb415dbe95f408b9ce91ee846ed" + diff & patch 30
31. How it works + Commits + sha1 (sha1 (open-input-string "hello world")) "2aae6c35c94fcfb415dbe95f408b9ce91ee846ed" + diff & patch + working directory | index | repository 31
32. That working directory | index | repository thing 32
33. 3: Try it out 33
34. Git Commands git config Get and set repository or global options. git config --global user.name "Jordan Schatz" git config --global user.email "jordan@noionlabs.com" 34
35. Git Commands git init Create an empty git repository. 35
36. Git Commands git add Add file contents to the index. 36
37. Git Commands git status Show the working tree status. 37
38. Git Commands git commit Record changes to the repository. 38
39. Git Commands gitk The git repository browser. 39
40. Git Commands git log Show commit logs. 40
41. Git Commands git clone Clone a repository into a new directory. 41
42. Git Commands git branch List, create, or delete branches. 42
43. Git Commands git checkout Checkout a branch or paths to the working tree. 43
44. Git Commands git push Update remote refs along with associated objects. 44
45. Git Commands git fetch Download objects and refs from another repository. 45
46. Git Commands git pull Fetch from and merge with another repository or a local branch. 46
47. Git Commands git remote manage set of tracked repositories. 47
48. Git Commands git stash Stash the changes in a dirty working directory away. 48
49. Git Commands git diff Show changes between commits, commit and working tree, etc. 49
50. Git Commands git clean Remove untracked files from the working tree. 50
51. Git Commands git merge Join two or more development histories together. 51
52. Git Commands git rebase Forward-port local commits to the updated upstream head. 52
53. Git Commands git fsck Verifies the connectivity and validity of the objects in the database. 53
54. Git Commands git gc Cleanup unnecessary files and optimize the local repository. 54
55. Git Commands git prune Prune all unreachable objects from the object database. 55
56. Git Commands git tag Create, list, delete or verify a tag object signed with GPG. 56
57. Git Commands git grep Print lines matching a pattern. 57
58. Git Commands git blame Show what revision and author last modified each line of a file. 58
59. Git Commands git gui A portable graphical interface to Git. 59
60. Git Commands git cherry-pick Apply the changes introduced by some existing commits. 60
61. Git Commands git bisect Find by binary search the change that introduced a bug. 61
62. Git Commands git show Show various types of objects. 62
63. Git Commands git format-patch Prepare patches for e-mail submission. 63
64. Git Commands git am Apply a series of patches from a mailbox. 64
65. Git Commands git reset Reset current HEAD to the specified state. 65
66. Git Commands git rm Remove files from the working tree and from the index. 66
67. Git Commands git archive Create an archive of files from a named tree. 67
68. Git Commands git mv Move or rename a file, a directory, or a symlink. 68
69. Git Commands git revert Revert some existing commits. 69
70. Git Commands git shortlog Summarize git log output. 70
71. Addendum 71
72. Gotcha’s + Git tracks content, not files. 72
73. Gotcha’s + Git tracks content, not files. + .gitignore 73
74. Gotcha’s + Git tracks content, not files. + .gitignore + git push (it does the right thing but) 74
75. Gotcha’s + Git tracks content, not files. + .gitignore + git push (it does the right thing but) + making commits/checkouts as root 75
76. Gotcha’s + Git tracks content, not files. + .gitignore + git push (it does the right thing but) + making commits/checkouts as root + chmod’ing the hooks when you didn’t mean too... 76
77. Tools + Github https://github.com/ 77
78. Tools + Github https://github.com/ + Deploy HQ http://www.deployhq.com/ 78
79. Tools + Github https://github.com/ + Deploy HQ http://www.deployhq.com/ + Gource http://code.google.com/p/gource/ 79
80. Tools + Github https://github.com/ + Deploy HQ http://www.deployhq.com/ + Gource http://code.google.com/p/gource/ + Gitosis http://scie.nti.st/2007/11/14/ hosting-git-repositories-the-easy-and-secure-way 80