Downloaded 16 times
![Commit!
$ git commit -m "First post"
[master (root-commit) 0ca3306] First post
1 files changed, 1 insertions(+), 0 deletions(-)
create mode 100644 arithmetic.rb](https://image.slidesharecdn.com/git-121109073648-phpapp02/85/Git-16-320.jpg)
![$ git commit -m "First post"
[master (root-commit) 0ca3306] First post
1 files changed, 1 insertions(+), 0 deletions(-)
create mode 100644 arithmetic.rb](https://image.slidesharecdn.com/git-121109073648-phpapp02/85/Git-36-320.jpg)
![Add another commit
$ cat >> arithmetic.rb
def minus(a, b); a - b; end
$ git add --patch
diff --git a/arithmetic.rb b/arithmetic.rb
index 171fe42..5c66815 100644
--- a/arithmetic.rb
+++ b/arithmetic.rb
@@ -1 +1,2 @@
def plus(a, b); a + b; end
+def minus(a, b); a - b; end
Stage this hunk [y,n,q,a,d,/,e,?]? y](https://image.slidesharecdn.com/git-121109073648-phpapp02/85/Git-70-320.jpg)
![Add another commit
$ cat >> arithmetic.rb
def minus(a, b); a - b; end
$ git add --patch
diff --git a/arithmetic.rb b/arithmetic.rb
index 171fe42..5c66815 100644
--- a/arithmetic.rb
+++ b/arithmetic.rb
@@ -1 +1,2 @@
def plus(a, b); a + b; end
+def minus(a, b); a - b; end
Stage this hunk [y,n,q,a,d,/,e,?]? y
$ git commit -m "Double the featureset"](https://image.slidesharecdn.com/git-121109073648-phpapp02/85/Git-71-320.jpg)
![Add another commit
$ cat >> arithmetic.rb
def minus(a, b); a - b; end
$ git add --patch
diff --git a/arithmetic.rb b/arithmetic.rb
index 171fe42..5c66815 100644
--- a/arithmetic.rb
+++ b/arithmetic.rb
@@ -1 +1,2 @@
def plus(a, b); a + b; end
+def minus(a, b); a - b; end
Stage this hunk [y,n,q,a,d,/,e,?]? y
$ git commit -m "Double the featureset"
[master d4655dd] Double the featureset
1 files changed, 1 insertions(+), 0 deletions(-)](https://image.slidesharecdn.com/git-121109073648-phpapp02/85/Git-72-320.jpg)
More Related Content
![[JS EXPERIENCE 2018] Javascript Event Loop além do setInterval - Derek Stavis](https://cdn.slidesharecdn.com/ss_thumbnails/9h20-10h00-derekstavis-180706155048-thumbnail.jpg?width=640&height=640&fit=bounds)
![Getting Started with Apache Spark: Big Data Made Simple [Free Meetup]](https://cdn.slidesharecdn.com/ss_thumbnails/apachesparkgettingstarted-260203175547-8361bcc3-thumbnail.jpg?width=640&height=640&fit=bounds)
Git
- 1. Fundamentals of Git Usageand Internals Jimmy Thrasher <jimmy@brownbirdlabs.com> @jimmythrasher
- 2. git (n) - acontemptible person, often a fool
- 3.
- 4.
- 5.
- 6. Initialize the repo $mkdir arithmetic; cd arithmetic
- 7. Initialize the repo $mkdir arithmetic; cd arithmetic $ git init
- 8. Initialize the repo $mkdir arithmetic; cd arithmetic $ git init Initialized empty Git repository in <path>/arithmetic/.git/
- 9. Generate some code $ cat > arithmetic.rb def plus(a, b); a + b; end ^D
- 10.
- 11. Stage the changes $git add .
- 12. Stage the changes $git add . $ git status
- 13. Stage the changes $git add . $ git status # On branch master # # Initial commit # # Changes to be committed: # (use "git rm --cached <file>..." to unstage) # # new file: arithmetic.rb #
- 14.
- 15. Commit! $ git commit-m "First post"
- 16. Commit! $ git commit-m "First post" [master (root-commit) 0ca3306] First post 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 arithmetic.rb
- 17.
- 18.
- 19. $ mkdir arithmetic;cd arithmetic $ git init Initialized empty Git repository in <path>/arithmetic/.git/
- 21. $ ls -l.git
- 22. $ ls -l.git total 24 -rw-r--r-- 1 jjthrash staff 23 Nov 6 21:05 HEAD -rw-r--r-- 1 jjthrash staff 111 Nov 6 21:05 config -rw-r--r-- 1 jjthrash staff 73 Nov 6 21:05 description drwxr-xr-x 12 jjthrash staff 408 Nov 6 21:05 hooks drwxr-xr-x 3 jjthrash staff 102 Nov 6 21:05 info drwxr-xr-x 4 jjthrash staff 136 Nov 6 21:05 objects drwxr-xr-x 4 jjthrash staff 136 Nov 6 21:05 refs
- 23. Generate some code $ cat > arithmetic.rb def plus(a, b); a + b; end ^D
- 24. $ git add. $ git status # On branch master # # Initial commit # # Changes to be committed: # (use "git rm --cached <file>..." to unstage) # # new file: arithmetic.rb #
- 25.
- 27. $ cat arithmetic.rb| git hash-object --stdin
- 28. $ cat arithmetic.rb| git hash-object --stdin 171fe423f0146d107db5d5c94ba205d86549ff14
- 29. $ cat arithmetic.rb| git hash-object --stdin 171fe423f0146d107db5d5c94ba205d86549ff14 $ git cat-file -p 171fe423f0146d107db5d5c94ba205d86549ff14
- 30. $ cat arithmetic.rb| git hash-object --stdin 171fe423f0146d107db5d5c94ba205d86549ff14 $ git cat-file -p 171fe423f0146d107db5d5c94ba205d86549ff14 def plus(a, b); a + b; end
- 31. $ cat arithmetic.rb| git hash-object --stdin 171fe423f0146d107db5d5c94ba205d86549ff14 $ git cat-file -p 171fe423f0146d107db5d5c94ba205d86549ff14 def plus(a, b); a + b; end $ find .git/objects -type f
- 32. $ cat arithmetic.rb| git hash-object --stdin 171fe423f0146d107db5d5c94ba205d86549ff14 $ git cat-file -p 171fe423f0146d107db5d5c94ba205d86549ff14 def plus(a, b); a + b; end $ find .git/objects -type f .git/objects/17/1fe423f0146d107db5d5c94ba205d86549ff14
- 34.
- 35.
- 36. $ git commit-m "First post" [master (root-commit) 0ca3306] First post 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 arithmetic.rb
- 37.
- 38. More Object Store ©Scott Chacon, Fig 9-1 “Git Internals—Git Objects”
- 39.
- 40. More Object Store ©Scott Chacon, Fig 9-3 “Git Internals—Git Objects”
- 42. $ git rev-parseHEAD
- 43. $ git rev-parseHEAD 0ca330690c2d1471ca4aa4c18c8fe3f53883f7a3
- 44. $ git rev-parseHEAD 0ca330690c2d1471ca4aa4c18c8fe3f53883f7a3 $ git cat-file -p 0ca330690c2d1471ca4aa4c18c8fe3f53883f7a3
- 45. $ git rev-parseHEAD 0ca330690c2d1471ca4aa4c18c8fe3f53883f7a3 $ git cat-file -p 0ca330690c2d1471ca4aa4c18c8fe3f53883f7a3 tree a9974d0f707a302dfd82370c357e87e1df813658 author Jimmy Thrasher <jimmy@jimmythrasher.com> 1352254463 -0500 committer Jimmy Thrasher <jimmy@jimmythrasher.com> 1352254463 -0500 First post
- 46. $ git rev-parseHEAD 0ca330690c2d1471ca4aa4c18c8fe3f53883f7a3 $ git cat-file -p 0ca330690c2d1471ca4aa4c18c8fe3f53883f7a3 tree a9974d0f707a302dfd82370c357e87e1df813658 author Jimmy Thrasher <jimmy@jimmythrasher.com> 1352254463 -0500 committer Jimmy Thrasher <jimmy@jimmythrasher.com> 1352254463 -0500 First post $ git cat-file -p a9974d0f707a302dfd82370c357e87e1df813658
- 47. $ git rev-parseHEAD 0ca330690c2d1471ca4aa4c18c8fe3f53883f7a3 $ git cat-file -p 0ca330690c2d1471ca4aa4c18c8fe3f53883f7a3 tree a9974d0f707a302dfd82370c357e87e1df813658 author Jimmy Thrasher <jimmy@jimmythrasher.com> 1352254463 -0500 committer Jimmy Thrasher <jimmy@jimmythrasher.com> 1352254463 -0500 First post $ git cat-file -p a9974d0f707a302dfd82370c357e87e1df813658 100644 blob 171fe423f0146d107db5d5c94ba205d86549ff14 arithmetic.rb
- 48. $ git rev-parseHEAD 0ca330690c2d1471ca4aa4c18c8fe3f53883f7a3 $ git cat-file -p 0ca330690c2d1471ca4aa4c18c8fe3f53883f7a3 tree a9974d0f707a302dfd82370c357e87e1df813658 author Jimmy Thrasher <jimmy@jimmythrasher.com> 1352254463 -0500 committer Jimmy Thrasher <jimmy@jimmythrasher.com> 1352254463 -0500 First post $ git cat-file -p a9974d0f707a302dfd82370c357e87e1df813658 100644 blob 171fe423f0146d107db5d5c94ba205d86549ff14 arithmetic.rb $ cat arithmetic.rb | git hash-object --stdin
- 49. $ git rev-parseHEAD 0ca330690c2d1471ca4aa4c18c8fe3f53883f7a3 $ git cat-file -p 0ca330690c2d1471ca4aa4c18c8fe3f53883f7a3 tree a9974d0f707a302dfd82370c357e87e1df813658 author Jimmy Thrasher <jimmy@jimmythrasher.com> 1352254463 -0500 committer Jimmy Thrasher <jimmy@jimmythrasher.com> 1352254463 -0500 First post $ git cat-file -p a9974d0f707a302dfd82370c357e87e1df813658 100644 blob 171fe423f0146d107db5d5c94ba205d86549ff14 arithmetic.rb $ cat arithmetic.rb | git hash-object --stdin 171fe423f0146d107db5d5c94ba205d86549ff14
- 51. $ find .git/objects-type f
- 52. $ find .git/objects-type f .git/objects/0c/a330690c2d1471ca4aa4c18c8fe3f53883f7a3 .git/objects/17/1fe423f0146d107db5d5c94ba205d86549ff14 .git/objects/a9/974d0f707a302dfd82370c357e87e1df813658
- 53.
- 55.
- 57. $ find .git/refs-type f
- 58. $ find .git/refs-type f .git/refs/heads/master
- 59. $ find .git/refs-type f .git/refs/heads/master $ cat .git/refs/heads/master
- 60. $ find .git/refs-type f .git/refs/heads/master $ cat .git/refs/heads/master 0ca330690c2d1471ca4aa4c18c8fe3f53883f7a3
- 61. $ find .git/refs-type f .git/refs/heads/master $ cat .git/refs/heads/master 0ca330690c2d1471ca4aa4c18c8fe3f53883f7a3 $ git log
- 62. $ find .git/refs-type f .git/refs/heads/master $ cat .git/refs/heads/master 0ca330690c2d1471ca4aa4c18c8fe3f53883f7a3 $ git log commit 0ca330690c2d1471ca4aa4c18c8fe3f53883f7a3 (HEAD, master) Author: Jimmy Thrasher <jimmy@jimmythrasher.com> Date: Tue Nov 6 21:14:23 2012 -0500 First post
- 63. $ find .git/refs-type f .git/refs/heads/master $ cat .git/refs/heads/master 0ca330690c2d1471ca4aa4c18c8fe3f53883f7a3 $ git log commit 0ca330690c2d1471ca4aa4c18c8fe3f53883f7a3 (HEAD, master) Author: Jimmy Thrasher <jimmy@jimmythrasher.com> Date: Tue Nov 6 21:14:23 2012 -0500 First post $ cat .git/HEAD
- 64. $ find .git/refs-type f .git/refs/heads/master $ cat .git/refs/heads/master 0ca330690c2d1471ca4aa4c18c8fe3f53883f7a3 $ git log commit 0ca330690c2d1471ca4aa4c18c8fe3f53883f7a3 (HEAD, master) Author: Jimmy Thrasher <jimmy@jimmythrasher.com> Date: Tue Nov 6 21:14:23 2012 -0500 First post $ cat .git/HEAD ref: refs/heads/master
- 65.
- 66.
- 67. Add another commit $cat >> arithmetic.rb
- 68. Add another commit $cat >> arithmetic.rb def minus(a, b); a - b; end
- 69. Add another commit $cat >> arithmetic.rb def minus(a, b); a - b; end $ git add --patch
- 70. Add another commit $cat >> arithmetic.rb def minus(a, b); a - b; end $ git add --patch diff --git a/arithmetic.rb b/arithmetic.rb index 171fe42..5c66815 100644 --- a/arithmetic.rb +++ b/arithmetic.rb @@ -1 +1,2 @@ def plus(a, b); a + b; end +def minus(a, b); a - b; end Stage this hunk [y,n,q,a,d,/,e,?]? y
- 71. Add another commit $cat >> arithmetic.rb def minus(a, b); a - b; end $ git add --patch diff --git a/arithmetic.rb b/arithmetic.rb index 171fe42..5c66815 100644 --- a/arithmetic.rb +++ b/arithmetic.rb @@ -1 +1,2 @@ def plus(a, b); a + b; end +def minus(a, b); a - b; end Stage this hunk [y,n,q,a,d,/,e,?]? y $ git commit -m "Double the featureset"
- 72. Add another commit $cat >> arithmetic.rb def minus(a, b); a - b; end $ git add --patch diff --git a/arithmetic.rb b/arithmetic.rb index 171fe42..5c66815 100644 --- a/arithmetic.rb +++ b/arithmetic.rb @@ -1 +1,2 @@ def plus(a, b); a + b; end +def minus(a, b); a - b; end Stage this hunk [y,n,q,a,d,/,e,?]? y $ git commit -m "Double the featureset" [master d4655dd] Double the featureset 1 files changed, 1 insertions(+), 0 deletions(-)
- 74. $ # thecommit $ git cat-file -p d4655ddec0830408c8a9eb2e97ff882254aa72ce
- 75. $ # thecommit $ git cat-file -p d4655ddec0830408c8a9eb2e97ff882254aa72ce tree adaa5519b385d57417efc1667a9ab9d86473e578 parent 0ca330690c2d1471ca4aa4c18c8fe3f53883f7a3 author Jimmy Thrasher <jimmy@jimmythrasher.com> 1352329222 -0500 committer Jimmy Thrasher <jimmy@jimmythrasher.com> 1352329222 -0500 Double the featureset
- 76. $ # thecommit $ git cat-file -p d4655ddec0830408c8a9eb2e97ff882254aa72ce tree adaa5519b385d57417efc1667a9ab9d86473e578 parent 0ca330690c2d1471ca4aa4c18c8fe3f53883f7a3 author Jimmy Thrasher <jimmy@jimmythrasher.com> 1352329222 -0500 committer Jimmy Thrasher <jimmy@jimmythrasher.com> 1352329222 -0500 Double the featureset $ # the tree $ git cat-file -p adaa5519b385d57417efc1667a9ab9d86473e578
- 77. $ # thecommit $ git cat-file -p d4655ddec0830408c8a9eb2e97ff882254aa72ce tree adaa5519b385d57417efc1667a9ab9d86473e578 parent 0ca330690c2d1471ca4aa4c18c8fe3f53883f7a3 author Jimmy Thrasher <jimmy@jimmythrasher.com> 1352329222 -0500 committer Jimmy Thrasher <jimmy@jimmythrasher.com> 1352329222 -0500 Double the featureset $ # the tree $ git cat-file -p adaa5519b385d57417efc1667a9ab9d86473e578 100644 blob 5c66815e4bccb85068bc884ea7963fd45347c212 arithmetic.rb
- 78. $ # thecommit $ git cat-file -p d4655ddec0830408c8a9eb2e97ff882254aa72ce tree adaa5519b385d57417efc1667a9ab9d86473e578 parent 0ca330690c2d1471ca4aa4c18c8fe3f53883f7a3 author Jimmy Thrasher <jimmy@jimmythrasher.com> 1352329222 -0500 committer Jimmy Thrasher <jimmy@jimmythrasher.com> 1352329222 -0500 Double the featureset $ # the tree $ git cat-file -p adaa5519b385d57417efc1667a9ab9d86473e578 100644 blob 5c66815e4bccb85068bc884ea7963fd45347c212 arithmetic.rb $ # the old commit $ git cat-file -p 0ca330690c2d1471ca4aa4c18c8fe3f53883f7a3
- 79. $ # thecommit $ git cat-file -p d4655ddec0830408c8a9eb2e97ff882254aa72ce tree adaa5519b385d57417efc1667a9ab9d86473e578 parent 0ca330690c2d1471ca4aa4c18c8fe3f53883f7a3 author Jimmy Thrasher <jimmy@jimmythrasher.com> 1352329222 -0500 committer Jimmy Thrasher <jimmy@jimmythrasher.com> 1352329222 -0500 Double the featureset $ # the tree $ git cat-file -p adaa5519b385d57417efc1667a9ab9d86473e578 100644 blob 5c66815e4bccb85068bc884ea7963fd45347c212 arithmetic.rb $ # the old commit $ git cat-file -p 0ca330690c2d1471ca4aa4c18c8fe3f53883f7a3 tree a9974d0f707a302dfd82370c357e87e1df813658 author Jimmy Thrasher <jimmy@jimmythrasher.com> 1352254463 -0500 committer Jimmy Thrasher <jimmy@jimmythrasher.com> 1352254463 -0500 First post
- 80. $ # thecommit $ git cat-file -p d4655ddec0830408c8a9eb2e97ff882254aa72ce tree adaa5519b385d57417efc1667a9ab9d86473e578 parent 0ca330690c2d1471ca4aa4c18c8fe3f53883f7a3 author Jimmy Thrasher <jimmy@jimmythrasher.com> 1352329222 -0500 committer Jimmy Thrasher <jimmy@jimmythrasher.com> 1352329222 -0500 Double the featureset $ # the tree $ git cat-file -p adaa5519b385d57417efc1667a9ab9d86473e578 100644 blob 5c66815e4bccb85068bc884ea7963fd45347c212 arithmetic.rb $ # the old commit $ git cat-file -p 0ca330690c2d1471ca4aa4c18c8fe3f53883f7a3 tree a9974d0f707a302dfd82370c357e87e1df813658 author Jimmy Thrasher <jimmy@jimmythrasher.com> 1352254463 -0500 committer Jimmy Thrasher <jimmy@jimmythrasher.com> 1352254463 -0500 First post $ # the old tree $ git cat-file -p a9974d0f707a302dfd82370c357e87e1df813658
- 81. $ # thecommit $ git cat-file -p d4655ddec0830408c8a9eb2e97ff882254aa72ce tree adaa5519b385d57417efc1667a9ab9d86473e578 parent 0ca330690c2d1471ca4aa4c18c8fe3f53883f7a3 author Jimmy Thrasher <jimmy@jimmythrasher.com> 1352329222 -0500 committer Jimmy Thrasher <jimmy@jimmythrasher.com> 1352329222 -0500 Double the featureset $ # the tree $ git cat-file -p adaa5519b385d57417efc1667a9ab9d86473e578 100644 blob 5c66815e4bccb85068bc884ea7963fd45347c212 arithmetic.rb $ # the old commit $ git cat-file -p 0ca330690c2d1471ca4aa4c18c8fe3f53883f7a3 tree a9974d0f707a302dfd82370c357e87e1df813658 author Jimmy Thrasher <jimmy@jimmythrasher.com> 1352254463 -0500 committer Jimmy Thrasher <jimmy@jimmythrasher.com> 1352254463 -0500 First post $ # the old tree $ git cat-file -p a9974d0f707a302dfd82370c357e87e1df813658 100644 blob 171fe423f0146d107db5d5c94ba205d86549ff14 arithmetic.rb
- 82. Object Store ©Scott Chacon,Fig 9-3 “Git Internals—Git Objects”
- 83.
- 85. $ git cat-file-p HEAD
- 86. $ git cat-file-p HEAD tree 6436ce8f07792aec3ec132fc4abb59d2a827cba7 parent 772883c59078484dc8990ffbc509e249e22a6c84 parent ff3ab8a25f623d4ceb3ea189090879dc67693cb5 author Rafael Mendonça França <rafaelmfranca@gmail.com> 1352404208 -0800 committer Rafael Mendonça França <rafaelmfranca@gmail.com> 1352404208 -0800 Merge pull request #8115 from senny/ 7842_handle_trailing_slash_with_engines handle trailing slash with engines (test case for #7842)
- 87.
- 88. git checkout -bbug-142 master master C1 bug-142 (HEAD)
- 89. #change code git commit -am “Fix problem with the widgets” C2 bug-142 (HEAD) master C1
- 90. git checkout master C2 bug-142 master (HEAD) C1
- 91. # make morechanges git commit -am “Moar changes!!1!” master (HEAD) C3 C2 bug-142 C1
- 92. git merge bug-142 master(HEAD) C4 C3 C2 bug-142 C1
- 93.
- 94. # got 2branches master (HEAD) C3 C2 bug-142 C1
- 95. git checkout bug-142 master C3 C2 bug-142 (HEAD) C1
- 96. git rebase master C4 bug-142 (HEAD) master C3 C2 C1
- 97. What didn’t Icover? • Workflow recommendations • Remotes, tags, “tree-ish” • Working with other developers • GitHub Pull Requests • Handy tips and tricks • etc
- 98. I Recommend • Pro-Git,by Scott Chacon (free ebook) • Everything git-related by @tpope
- 99.
- 100.
Editor's Notes
- #2 The audience: How many developers?\n\nQuestions: please interrupt with directly on-topic questions. Please save the anticipatory or unrelated questions to the end.\n
- #3 git is a version control tool\n\nLinus Torvalds wrote it. Says he has a propensity for naming his projects after himself.\n\nDistributed: no latency commits, productivity when offline or server down, all repositories equal, create your own workflow.\n\nPowerful: lightweight branching, robust merging, rebase.\n\nFast: hard links when available, efficient lookups via FS\n\nBut it has abstractions bleeding from its pores. You really have to understand how it works to use it effectively. Hence, this presentation.\n
- #4 Lean on your version control!\n- Avoid dead code, unnecessary/misleading comments, backup files\n- Make changes fearlessly\nUse your version control so that it can be leaned on\n- Meaningful commits and commit messages\n- Keep commits small and distinct\n- Avoid unnecessary formatting changes\nReasoning about the code base\n- Your version control needs to have a coherent history\n
- #5 \n
- #6 \n
- #7 \n
- #8 \n
- #9 Make changes to the working copy\n
- #10 Make changes to the index\n
- #11 Make changes to the index\n
- #12 Make changes to the index\n
- #13 Make changes to the index\n
- #14 Make changes to the index\n
- #15 Make changes to the index\n
- #16 Make changes to the index\n
- #17 Make changes to the index\n
- #18 Make changes to the index\n
- #19 Make changes to the index\n
- #20 Make changes to the index\n
- #21 Make changes to the object store\n\nThese are the three areas you work with: the working copy, the staging area or index, the object store.\n
- #22 Make changes to the object store\n\nThese are the three areas you work with: the working copy, the staging area or index, the object store.\n
- #23 Make changes to the object store\n\nThese are the three areas you work with: the working copy, the staging area or index, the object store.\n
- #24 Make changes to the object store\n\nThese are the three areas you work with: the working copy, the staging area or index, the object store.\n
- #25 Making changes, staging them, and committing is the majority of what you do in git.\n
- #26 \n
- #27 \n
- #28 \n
- #29 \n
- #30 \n
- #31 \n
- #32 \n
- #33 \n
- #34 \n
- #35 \n
- #36 \n
- #37 Make changes to the working copy\n
- #38 \n
- #39 Key/Value database\nKey is the SHA1 hash of the Value\n
- #40 \n
- #41 \n
- #42 \n
- #43 \n
- #44 \n
- #45 \n
- #46 \n
- #47 \n
- #48 \n
- #49 Three main types of objects in the object store. The two depicted here are blobs and trees.\nA blob represents files in the filesystem.\nA tree represents directories in the filesystem.\n
- #50 Three main types of objects in the object store. The two depicted here are blobs and trees.\nA blob represents files in the filesystem.\nA tree represents directories in the filesystem.\n
- #51 \n
- #52 \n
- #53 \n
- #54 \n
- #55 \n
- #56 \n
- #57 \n
- #58 \n
- #59 \n
- #60 \n
- #61 \n
- #62 \n
- #63 \n
- #64 \n
- #65 \n
- #66 \n
- #67 \n
- #68 Where are we now? We have learned:\n- the three main types of objects in the object store\n- commits are snapshots of the working copy\n- commit history is a directed acyclic graph of commits\n- commits are documents that point to trees and other commits\n- trees are documents that point to blobs and other trees\n- blobs are the end of the line\n\nWhat are we missing?\n(cat picture)\n
- #69 \n
- #70 I referred to HEAD earlier. What&#x2019;s that?\nIt&#x2019;s called a ref. Refs point to commits, sometimes directly, sometimes indirectly. HEAD is a ref to the branch you&#x2019;re currently on.\n
- #71 \n
- #72 \n
- #73 \n
- #74 \n
- #75 \n
- #76 \n
- #77 \n
- #78 \n
- #79 \n
- #80 \n
- #81 \n
- #82 \n
- #83 git add --patch is a great way to stage only the changes you want.\n
- #84 git add --patch is a great way to stage only the changes you want.\n
- #85 git add --patch is a great way to stage only the changes you want.\n
- #86 git add --patch is a great way to stage only the changes you want.\n
- #87 git add --patch is a great way to stage only the changes you want.\n
- #88 git add --patch is a great way to stage only the changes you want.\n
- #89 git add --patch is a great way to stage only the changes you want.\n
- #90 git add --patch is a great way to stage only the changes you want.\n
- #91 git add --patch is a great way to stage only the changes you want.\n
- #92 git add --patch is a great way to stage only the changes you want.\n
- #93 git add --patch is a great way to stage only the changes you want.\n
- #94 git add --patch is a great way to stage only the changes you want.\n
- #95 git add --patch is a great way to stage only the changes you want.\n
- #96 git add --patch is a great way to stage only the changes you want.\n
- #97 \n
- #98 \n
- #99 \n
- #100 \n
- #101 \n
- #102 \n
- #103 \n
- #104 \n
- #105 \n
- #106 \n
- #107 \n
- #108 \n
- #109 \n
- #110 \n
- #111 \n
- #112 \n
- #113 \n
- #114 \n
- #115 \n
- #116 \n
- #117 A branch is just a different HEAD reference. It may or may not point to the same commit as another branch.\nMerging means creating a commit with 2 parent commits.\n
- #118 \n
- #119 \n
- #120 \n
- #121 \n
- #122 \n
- #123 \n
- #124 \n
- #125 \n
- #126 Say you have a commit in your master branch\n
- #127 Create what&#x2019;s called a topic branch.\nbug-142 is now your current branch.\n
- #128 Fix your code and check in your changes.\n
- #129 Go back to master while you wait for the bug-142 branch to be verified, merged, whatever.\n
- #130 Make a small change and commit.\n
- #131 Merge bug-142 into master\n\nNotice bug-142 still points to its old commit. Merging typically doesn&#x2019;t affect anything but the HEAD.\n
- #132 Where merging is joining two or more nodes into one node by creating a new node,\nrebasing is cutting a portion of the graph off and reparenting it.\nHow does this work? <replay patches>\n
- #133 Let&#x2019;s say we have the two branches from before, but this time, I want my bug-142 branch to be rebased off of master. This could be to incorporate changes master has, or whatever.\n
- #134 Check out bug-142 again\n
- #135 Do the rebase!\n\nIt backs C2 out and pushes it onto a stack of patches\nThen it moves to C3.\nThen it replays the patch.\n\nThis creates new commits. Why? New trees, new commit timestamps, etc, all lead to new SHA1 hashes.\n\nNotice the dangling C2.\n\nThis is an important principle. VERY RARELY does stuff get expunged from your object store. It&#x2019;s typically add-only.\n
- #136 \n
- #137 \n
- #138 \n
- #139 Just to get the polarizing irrelevant stuff:\nVim, not emacs. Spaces, not tabs. Ruby, not Python. Black licorice (red licorice isn&#x2019;t fit to bear the name).\nI won&#x2019;t tell you my distro of choice because of where we are. ;)\n