O slideshow foi denunciado.
Be a Happier
Developer
with
...opp!
Be a Happier
Developer
with
:-)
Git makes more sense when you understand “X”
Why was it
made?
git is … not this
git is… snapshots, not differences
so deep!
“everythings is check-sumed”
no deletion!
so...only ADD
Too big?
Linux Kernel:
- 15+ milions LoC
- 12k non-merged commits
- 1300+ contributors
--every-things is
local
The ”three states”
...
--amend
reate a new commit and use it to
replace the last one
Stashing-Tool
Sumary
Commit
so deep!
Visualizing
Git Repository
With visualize tools
...more serious
With `git log` command
Naming that
***king SHA-1,
plzz!
Refs - pointers to commits
heads
attacked/detacked
HEAD
Sumary
Reset
First Step:
Move back the
HEAD
Second Step:
Reset Staging-Area
Third Step:
Reset Working-
Directory
give git-reset a
<path>
- Dont touch the head
- Touch only the <path>
Squashing
Check it out!
Summary
Branching
Cheap branching
Attach HEAD to branch
Move forward
Merging A into B
Merging A into B: fast-forward
Merging A into B: fast-forward (2)
Merging A into B: no-fast-forward
Merging A into B: no-fast-forward (2)
Merging A into B: resolve conflict
Rebasing: move branch's root
Summary
Syncing
git-remote
tracking branch
update refs
update refs,
and merge!
BDDD
BDDD (2)
update refs,
and rebase!
Update remote
Next Chapter: Make Your Collaborators More Happy With Git
Flexibling Git - Be a Happier Developer with Git
Flexibling Git - Be a Happier Developer with Git
Flexibling Git - Be a Happier Developer with Git
Flexibling Git - Be a Happier Developer with Git
Flexibling Git - Be a Happier Developer with Git
Flexibling Git - Be a Happier Developer with Git
Flexibling Git - Be a Happier Developer with Git
Flexibling Git - Be a Happier Developer with Git
Flexibling Git - Be a Happier Developer with Git
Próximos SlideShares
Carregando em…5
×

Flexibling Git - Be a Happier Developer with Git

60 visualizações

Publicada em

Present about git for VNEXTers - Part 1
Present git the hardway
Cover about git's behinds

  • Seja o primeiro a comentar

  • Seja a primeira pessoa a gostar disto

Flexibling Git - Be a Happier Developer with Git

  1. 1. Be a Happier Developer with
  2. 2. ...opp!
  3. 3. Be a Happier Developer with :-)
  4. 4. Git makes more sense when you understand “X”
  5. 5. Why was it made?
  6. 6. git is … not this
  7. 7. git is… snapshots, not differences
  8. 8. so deep! “everythings is check-sumed”
  9. 9. no deletion! so...only ADD
  10. 10. Too big? Linux Kernel: - 15+ milions LoC - 12k non-merged commits - 1300+ contributors
  11. 11. --every-things is local
  12. 12. The ”three states”
  13. 13. ...
  14. 14. --amend reate a new commit and use it to replace the last one
  15. 15. Stashing-Tool
  16. 16. Sumary
  17. 17. Commit
  18. 18. so deep!
  19. 19. Visualizing Git Repository With visualize tools
  20. 20. ...more serious With `git log` command
  21. 21. Naming that ***king SHA-1, plzz! Refs - pointers to commits
  22. 22. heads
  23. 23. attacked/detacked HEAD
  24. 24. Sumary
  25. 25. Reset
  26. 26. First Step: Move back the HEAD
  27. 27. Second Step: Reset Staging-Area
  28. 28. Third Step: Reset Working- Directory
  29. 29. give git-reset a <path> - Dont touch the head - Touch only the <path>
  30. 30. Squashing
  31. 31. Check it out!
  32. 32. Summary
  33. 33. Branching
  34. 34. Cheap branching
  35. 35. Attach HEAD to branch
  36. 36. Move forward
  37. 37. Merging A into B
  38. 38. Merging A into B: fast-forward
  39. 39. Merging A into B: fast-forward (2)
  40. 40. Merging A into B: no-fast-forward
  41. 41. Merging A into B: no-fast-forward (2)
  42. 42. Merging A into B: resolve conflict
  43. 43. Rebasing: move branch's root
  44. 44. Summary
  45. 45. Syncing
  46. 46. git-remote
  47. 47. tracking branch
  48. 48. update refs
  49. 49. update refs, and merge!
  50. 50. BDDD
  51. 51. BDDD (2)
  52. 52. update refs, and rebase!
  53. 53. Update remote
  54. 54. Next Chapter: Make Your Collaborators More Happy With Git

×