Recommended
More Related Content
What's hot
What's hot (13)
Similar to maksym vlasov - culture of git as roots of your ci
Similar to maksym vlasov - culture of git as roots of your ci (20)
More from Dariia Seimova
More from Dariia Seimova (10)
Recently uploaded
Recently uploaded (20)
maksym vlasov - culture of git as roots of your ci
- 1. Culture of git as roots of your CI Maksym Vlasov, PDFfiller, Ukraine
- 9. Why I'm here? 1 week 8workdays
- 10. Why I'm here? 1 week 8workdays
- 15. Styleguide • Commit messages https://chris.beams.io/posts/git-commit/ • Branch naming
- 16. Styleguide • Commit messages https://chris.beams.io/posts/git-commit/ • Branch naming issue_type / [ path_to_folder /] ( short_description | Jira issue ID | GitHub issue # )
- 17. Debug/fix commits 1. Use WIP bot https://github.com/apps/wip 2. Fixed new functionality? Use git rebase -> fixup
- 18. Debug/fix commits 1. Use WIP bot https://github.com/apps/wip 2. Fixed new functionality? Use git rebase -> fixup 3. Yes, you CAN change history in your branch 4. Found bug for old functional? Fix it in new branch
- 19. Debug/fix commits 1. Use WIP bot https://github.com/apps/wip 2. Fixed new functionality? Use git rebase -> fixup 3. Yes, you CAN change history in your branch 4. Found bug for old functional? Fix it in new branch 5. Use --force-with-lease instead of --force 6. MUST NOT fix/debug/change history in master.
- 20. I also make this mistakes, so... ?
- 21. Do review your code yourself
- 22. Do review your code yourself Yet another 23 commits here
- 23. Do review your code yourself Yet another 23 commits here 4,5 hours
- 24. Do review your code yourself Yet another 23 commits here 4,5 hours 8k lines Restructured 2 branches to 1 81 commits to 23 w/o lossing informative
- 25. How I did it? • git rebase -i functional (link) • Spliting commits (link) • git branch -m, git branch -D • Few tea cups and good music :)
- 26. Useful links Please, read it: • habr.com/company/flant/blog/419733 • codementor.io/citizen428/git-tutorial-10-common-git-problems-and- how-to-fix-them-aajv0katd • gist.github.com/wayspurrchen/940a21127b77ac1a9720 • git-scm.com/doc Link to presentation: tinyurl.com/stage-git
- 27. Git tags > tag specific points in history as being important https://git-scm.com/book/en/v2/Git-Basics-Tagging
- 28. Git tags
- 29. Git submodules
- 30. Git submodules • Submodules, like subtrees, aim to reuse code from another repo somewhere inside your own repo’s tree https://medium.com/@porteneuve/mastering-git-submodules-34c65e940407
- 31. Git submodules [status] submoduleSummary = true [diff] submodule = log [push] recurseSubmodules = on-demand [alias] spull = "__git_spull() { git pull "$@" && git submodule sync -recursive && git submodule update --init --recursive; }; __git_spull" https://medium.com/@porteneuve/mastering-git-submodules-34c65e940407
- 36. Work efficiency time! • Use aliases
- 37. Work efficiency time! • Use aliases – Oh-my-zsh: Cheatsheet – Other: • Look at oh-my-zsh aliases :)
- 38. Work efficiency time! • Use aliases – Oh-my-zsh: Cheatsheet – Other: • Look at oh-my-zsh aliases :) • g = git • gb = git branch • gc = git commit -v • gc! = git commit -v --amend • gcb = git checkout -b • gco = git checkout • gss = git status -s
- 39. Work efficiency time! b = branch -vv bb = branch -vv --all bbb = "!git for-each-ref --format='%(committerdate) %09 %(authorname) %09 %(refname:short)' | sort" More here
- 40. Work efficiency time! stsv = !git stash save $(date "+%F_%T") la = "!git config -l | grep alias| cut -c 7-" s = "!f() { [ -z "$GIT_PREFIX" ] || cd "$GIT_PREFIX" && git diff --color "$@" | diff-so-fancy | less --tabs=4 -RFX; }; f" More here
- 41. Work efficiency time! • Use aliases • Use git hooks
- 42. Work efficiency time! • Use aliases • Use git hooks – Client-Side – Server-Side
- 43. Work efficiency time! pre-commit (by default)
- 46. Work efficiency time! And many others: https://www.atlassian.com/git/tutorials/git-hooks https://www.kernel.org/pub/software/scm/git/docs/githooks.html
- 47. Work efficiency time! • Use aliases • Use git hooks • Read git history
- 48. Work efficiency time! glog = git log --oneline --decorate --color --graph
- 49. Work efficiency time! lg = log --graph --pretty=format:"%C(yellow)[%h]%Creset %Cred[%ar]%Creset%Cblue[%an]%Creset%s"
- 50. Work efficiency time! l = log --pretty=format:"%C(yellow)[%h]%Creset %Cred[%ar]%Creset%Cblue[%an]%Creset%s" --since=1.weeks
- 51. Work efficiency time! ls = log --pretty=format:"%C(yellow)%h%Cred%d %Cblue[%an]%Creset%s" --decorate --numstat
- 52. Work efficiency time! lss = log -p --pretty=format:"%C(yellow)[%h]%Creset %Cred[%ar]%Creset%Cblue[%an]%Creset%s"
- 53. Work efficiency time! • Use aliases • Use git hooks • Read git history • Use global .gitignore
- 54. Work efficiency time! • Use aliases • Use git hooks • Read git history • Use global .gitignore – ~/.config/git/ignore – [core] excludesfile = ~/git/ignore_global
- 55. Work efficiency time! • Use aliases • Use git hooks • Read git history • Use global .gitignore • Sign all with GPG
- 56. Work efficiency time! [user] signingkey = D17008C3CDCF957F [gpg] program = /usr/bin/gpg [commit] gpgsign = true https://git-scm.com/book/en/v2/Git-Tools-Signing-Your-Work https://help.github.com/articles/managing-commit-signature-verification/
- 57. Work efficiency time! • Use aliases • Use git hooks • Read git history • Use global .gitignore • Sign all with GPG • And use your own ...
- 58. Work efficiency time! • Use aliases • Use git hooks • Read git history • Use global .gitignore • Sign all with GPG • And use your own to conquer Dimension X
- 59. More useful links • Useful Git Techniques gist.github.com/wayspurrchen/940a 21127b77ac1a9720 • The rabbit hole with hooks github.com/git-hooks/git-hooks • And git-scm.com/doc (: Link to presentation: tinyurl.com/stage-git