Git best practices - Require(lx)
•Download as PPTX, PDF•
1 like•44 views
January 23, 2019 https://www.meetup.com/require-lx/events/258092777/
Recommended
More Related Content
Recently uploaded
Recently uploaded (20)
Featured
Featured (20)
Git best practices - Require(lx)
- 1. GIT Best Practices & Tips
- 2. THAMARA HESSEL I’m a coder
- 3. 3 Agenda ▪ Git on server ▪ What is your level of gitter? ▪ Git Areas vs life cycle ▪ Git Commit Anatomy ▪ Daily Git ▪ Tips ▪ Best Practices ▪ Tools ▪ Tips to study
- 6. What is your level as gitter?
- 7. Add 1 point for each following command that you know. READY?
- 8. Add
- 9. Commit
- 10. Status
- 11. Diff
- 12. Show
- 13. Log
- 14. Branch
- 15. Checkout
- 16. Pull
- 17. Push
- 18. Reset
- 19. Stash
- 20. Rebase
- 21. Cherry-pick
- 22. Fetch
- 23. Merge
- 24. Tag
- 25. Describe
- 26. Revert
- 27. Describe
- 28. Reflog
- 29. Cat-file
- 30. What is your level?
- 31. Beginner 0 ~ 7
- 32. Intermediate 8 ~ 14
- 33. Pro 15 ~ 20
- 34. Magic 20 +
- 35. Git areas vs life cycle
- 36. Git areas
- 42. Life cycle
- 44. 44 Git areas Remote ./refs HEAD FETCH_HEAD ORIG_HEAD ./objects .git/ Sync .git/ src/ Workspace Staged pull push checkout commit
- 45. 45 Git areas Remote ./refs HEAD FETCH_HEAD ORIG_HEAD ./objects .git/ Sync .git/ src/ Workspace StagedUnstagedUntracked pull push checkout commit
- 46. 46 Git areas Remote ./refs HEAD FETCH_HEAD ORIG_HEAD ./objects .git/ Sync .git/ src/ Workspace StagedUnstagedUntracked pull push checkout commit
- 47. 47 Git areas Remote ./refs HEAD FETCH_HEAD ORIG_HEAD ./objects .git/ Sync .git/ src/ Workspace StagedUnstagedUntracked checkout commit pull push
- 48. 48 Git areas Remote ./refs HEAD FETCH_HEAD ORIG_HEAD ./objects .git/ Sync .git/ src/ Workspace StagedUnstagedUntracked pull push checkout commit
- 50. 50 Git commit anatomy sha1( ) 89cdef670219d83a4ef76ed0e1df4d4c5aa321f7 commit message committer commit date author authoring date tree parents => ‘commit message’ => Thamara Hessel <thamara.hessel@olx.com> => Wed Jan 23 11:13:49 2019 +0100 => Thamara Hessel <thamara.hessel@olx.com> => Wed Jan 23 11:13:49 2019 +0100 => 73a57b4216d66f9bdefdfe7ef7d40bdc05bea372 => [40285027dd831ac849f224559787323376613b71]
- 51. 51 Git commit anatomy sha1( ) 89cdef670219d83a4ef76ed0e1df4d4c5aa321f7 commit message committer commit date author authoring date tree parents => ‘commit message’ => Thamara Hessel <thamara.hessel@olx.com> => Wed Jan 23 11:13:49 2019 +0100 => Thamara Hessel <thamara.hessel@olx.com> => Wed Jan 23 11:13:49 2019 +0100 => 73a57b4216d66f9bdefdfe7ef7d40bdc05bea372 => [40285027dd831ac849f224559787323376613b71]
- 52. 52 Git commit anatomy sha1( ) 89cdef670219d83a4ef76ed0e1df4d4c5aa321f7 commit message committer commit date author authoring date tree parents => ‘commit message’ => Thamara Hessel <thamara.hessel@olx.com> => Wed Jan 23 11:13:49 2019 +0100 => Thamara Hessel <thamara.hessel@olx.com> => Wed Jan 23 11:13:49 2019 +0100 => 73a57b4216d66f9bdefdfe7ef7d40bdc05bea372 => [40285027dd831ac849f224559787323376613b71]
- 53. 53 Git commit anatomy sha1( ) 89cdef670219d83a4ef76ed0e1df4d4c5aa321f7 commit message committer commit date author authoring date tree parents => ‘commit message’ => Thamara Hessel <thamara.hessel@olx.com> => Wed Jan 23 11:13:49 2019 +0100 => Thamara Hessel <thamara.hessel@olx.com> => Wed Jan 23 11:13:49 2019 +0100 => 73a57b4216d66f9bdefdfe7ef7d40bdc05bea372 => [40285027dd831ac849f224559787323376613b71]
- 54. 54 Git commit anatomy sha1( ) 89cdef670219d83a4ef76ed0e1df4d4c5aa321f7 commit message committer commit date author authoring date tree parents => ‘commit message’ => Thamara Hessel <thamara.hessel@olx.com> => Wed Jan 23 11:13:49 2019 +0100 => Thamara Hessel <thamara.hessel@olx.com> => Wed Jan 23 11:13:49 2019 +0100 => 73a57b4216d66f9bdefdfe7ef7d40bdc05bea372 => [40285027dd831ac849f224559787323376613b71]
- 59. 59 Git commit anatomy ./refs HEAD FETCH_HEAD ORIG_HEAD ./objects .git/ SyncStagedUnstagedUntracked pull push checkout commit ebe0f20e COMMIT
- 60. 60 Git commit anatomy $ git reflog .git/logs/
- 61. Daily Git
- 64. Custom & Configs
- 65. 65 Daily tips - Custom & Configs .git/config/
- 66. 66 Daily tips - Custom & Configs .git/config/ --local Project
- 67. 67 Daily tips - Custom & Configs .git/config/ --local --global Project User
- 68. 68 Daily tips - Custom & Configs .git/config/ --system--local --global Project User Machine
- 69. 69 Daily tips - Custom & Configs $ git config -e {level}
- 70. 70 Daily tips - Custom & Configs --local [remote "origin"] url = git@github.com:PROJECT.git fetch = +refs/heads/*:refs/remotes/origin/* [branch "develop"] remote = origin merge = refs/heads/develop [branch "master"] remote = origin merge = refs/heads/master $ git config -e --local
- 71. 71 Daily tips - Custom & Configs --global $ git config -e --global [user] name = thamara.hessel email = thamara.hessel@xxxxxxx [alias] ls = log --oneline la = log --all --graph --decorate --oneline --abbrev-commit sm = show -s tags = tag -l [pull] rebase = true
- 72. 72 Daily tips - Custom & Configs --global--local [remote "origin"] url = git@github.com:PROJECT.git fetch = +refs/heads/*:refs/remotes/origin/* [branch "develop"] remote = origin merge = refs/heads/develop [branch "master"] remote = origin merge = refs/heads/master $ git config -e {level} [user] name = thamara.hessel email = thamara.hessel@xxxxxxx [alias] ls = log --oneline la = log --all --graph --decorate --oneline --abbrev-commit sm = show -s tags = tag -l [pull] rebase = true
- 73. Git hooks
- 74. 74 Daily tips - Git hooks $ git commit -m ‘simple commit’
- 75. 75 Daily tips - Git hooks .git/hooks/ $ git commit -m ‘simple commit’
- 76. 76 Daily tips - Git hooks .git/hooks/ applypatch-msg.sample post-update.sample pre-commit pre-push.sample pre-rebase.sample prepare-commit-msg.sample commit-msg.sample pre-applypatch.sample pre-commit.sample pre-push.sample pre-receive.sample update.sample $ git commit -m ‘simple commit’
- 77. Best practices
- 78. Be clean
- 79. 79 Best Practices-Ignore When you’re working on a private workspace, you should always skip your private configs, it’s a good practice. Standalone .gitignore src/ Workspace
- 80. 80 Best Practices-Rebase When you’re working on a feature, you should always commit often it’s a good practice. But when you’re finished, you should always squash it into a single commit. Standalone
- 81. 81 Best Practices-Rebase Standalone $ git rebase -i HEAD~6
- 82. 82 Best Practices-Rebase Standalone $ git rebase -i HEAD~6
- 83. 83 Best Practices-Rebase Standalone $ git rebase -i HEAD~6
- 84. 84 Best Practices-Rebase Standalone $ git rebase -i HEAD~6 $ git rebase -i c813325b0..bf3fb03cc
- 85. 85 Best Practices-Rebase Standalone $ git rebase -i HEAD~6 $ git rebase -i c813325b0..bf3fb03cc ➔ p, pick ➔ r, reword ➔ e, edit ➔ s, squash ➔ f, fixup ➔ x, exec ➔ d,drop options
- 86. 86 Best Practices-Rebase Standalone ➔ p, pick ➔ r, reword ➔ e, edit ➔ s, squash ➔ f, fixup ➔ x, exec ➔ d,drop $ git rebase -i HEAD~6 $ git rebase -i c813325b0..bf3fb03cc options Rebase only for you
- 87. 87 Best Practices-Merge Team Merge is a great operation but it should be used correctly. Merge is supposed to tell a story. It’s great when you want to make a release or a hotfix. In that way you can identify exactly what you released by tagging the merge commit with a version If you are consistently merging your “developing” code with a stable branch, it’s gonna do more harm than good.
- 88. Be assertive
- 89. 89 Best Practices-Commits A project long term success should depend on the way the “project log” is maintained. It’s up to the users of the project to be the maintainers. It’s easy to be sidetracked and forget about doing the right thing, but it’s always better to be respectful of your own work. You never know when you will have to consult it later. Standalone
- 90. 90 Best Practices-Commits A project long term success should depend on the way the “project log” is maintained. It’s up to the users of the project to be the maintainers. It’s easy to be sidetracked and forget about doing the right thing, but it’s always better to be respectful of your own work. You never know when you will have to consult it later. Standalone bugfix minor changes wtf BUG-9284 more work Work on feature GRE-3958 Fix Change X constant to be 10 Hot Fix oopsie
- 91. 91 Best Practices-Commits Standalone 1. Separate subject from body with a blank line 2. Limit the subject line to 50 characters 3. Capitalize the subject line 4. Use the imperative mood in the subject line 5. Wrap the body at 72 characters 6. Use the body to explain what and why vs. how Golden rules
- 92. 99 Best Practices-Commits Standalone ❏ 50 characters ❏ Capitalize ❏ A blank line ❏ Imperative mood ❏ 72 characters ❏ Body to explain what and why vs. how Full example
- 93. 100 Best Practices-Commits Standalone ❏ 50 characters ❏ Capitalize ❏ A blank line ❏ Imperative mood ❏ 72 characters ❏ Body to explain what and why vs. how Full example
- 94. 101 Best Practices-Commits Standalone ❏ 50 characters ❏ Capitalize ❏ A blank line ❏ Imperative mood ❏ 72 characters ❏ Body to explain what and why vs. how Full example
- 95. 102 Best Practices-Commits Standalone ❏ 50 characters ❏ Capitalize ❏ A blank line ❏ Imperative mood ❏ 72 characters ❏ Body to explain what and why vs. how Full example
- 96. 103 Best Practices-Commits Standalone ❏ 50 characters ❏ Capitalize ❏ A blank line ❏ Imperative mood ❏ 72 characters ❏ Body to explain what and why vs. how Full example
- 97. 104 Best Practices-Commits Standalone ❏ 50 characters ❏ Capitalize ❏ A blank line ❏ Imperative mood ❏ 72 characters ❏ Body to explain what and why vs. how Full example
- 98. Tools
- 101. Don’t be a slave
- 102. 109 Best Practices-Don’t be a slave Use GUIs and CLIs with moderation Golden tip
- 103. Tips to study
- 106. Command help $ git help
- 109. Q&A
- 111. ● https://www.slideshare.net/hyderabadscalability/git-internals-57308417 ● https://www.slideshare.net/ThamaraHessel/git-saia-do-bsico ● https://services.github.com/on-demand/downloads/github-git-cheat-sheet.pdf ● http://ndpsoftware.com/git-cheatsheet.html#loc=stash; ● https://git-scm.com/docs/gitk ● https://stackoverflow.com/questions/35430584/how-is-the-git-hash-calculated ● https://blog.thoughtram.io/git/2014/11/18/the-anatomy-of-a-git-commit.html ● https://medium.freecodecamp.org/understanding-git-for-real-by-exploring-the-git-directory-1e079c15b807 ● https://git-scm.com/docs/giteveryday ● https://git-scm.com/docs/gitworkflows ● https://git-scm.com/doc/ext ● https://git-scm.com/book/en/v2/Appendix-C%3A-Git-Commands-Plumbing-Commands References
- 112. 119