Sendo ágil com git
3 likes747 views
The document appears to be a technical guide or notes on using Git for version control, including commands for branching, merging, and managing commits. It also includes personal references to the author's blog and podcasts. Various Git commands are mentioned alongside practical tips and examples for effective usage.
Sendo ágil com git
- 1. Sendo ágil com w w w. l a m b d a 3 . c o m . b r
- 2. Giovanni Bassi • Programador • Microsoft MVP • Não gerente • blog.lambda3.com.br, podcast.lambda3.com.br, nodebr, dockersp @giovannibassi /giggio.tech • Escalador e ciclista
- 7. Agenda
- 10. Clone 93230c5 master HEAD = commit = branch = HEAD origin/ master
- 11. Commit 93230c5 0ac78b6 master HEAD = commit = branch = HEAD origin/ master
- 12. Commit 93230c5 0ac78b6 master HEAD = commit = branch = HEAD origin/ master 4ebf653
- 13. Push 93230c5 0ac78b6 master HEAD = commit = branch = HEAD origin/ master 4ebf653
- 14. Checkout branch
- 15. Branch = commit = branch = HEAD 93230c5 0ac78b6 c77926b 4ebf653 master outro HEAD
- 16. Checkout = commit = branch = HEAD 93230c5 0ac78b6 c77926b 4ebf653 master outro HEAD
- 18. Trabalho no branch “outro” terminado = commit = branch = HEAD 93230c5 0ac78b6 c77926b 4ebf653 master HEADoutro
- 19. Merge master = commit = branch = HEAD 93230c5 0ac78b6 c77926b 4ebf653 master HEAD outrod4545ea
- 20. Checkout master = commit = branch = HEAD 93230c5 0ac78b6 c77926b 4ebf653 master outrod4545ea HEAD
- 21. Merge outro = commit = branch = HEAD 93230c5 0ac78b6 c77926b 4ebf653 master outrod4545ea HEAD
- 23. Progredindo com
- 24. Clone 93230c5 master HEAD = commit = branch = HEAD origin/ master
- 25. Add 93230c5 = commit = branch = HEAD origin/ master master HEAD Staging /Index Staging/IndexStaging/Index
- 26. Commit 93230c5 0ac78b6 master HEAD = commit = branch = HEAD origin/ master
- 27. Commit 93230c5 0ac78b6 = commit = branch = HEAD origin/ master master HEAD
- 28. 7f3ddf Commit 93230c5 0ac78b6 master HEAD = commit = branch = HEAD origin/ master
- 29. 7f3ddf Commit 93230c5 0ac78b6 master HEAD = commit = branch = HEAD origin/ master
- 30. Commit 93230c5 0ac78b6 master HEAD = commit = branch = HEAD origin/ master 7f3ddf 7bdf1a
- 32. Squash
- 33. Commit 93230c5 0ac78b6 master HEAD = commit = branch = HEAD origin/ master 7f3ddf 7bdf1a
- 34. Mensagens 93230c5 0ac78b6 7f3ddf 7bdf1a
- 35. Mensagens 93230c5 0ac78b6 7f3ddf 7bdf1a
- 36. Mensagens 93230c5 0ac78b6 7f3ddf 7bdf1a
- 37. Mensagens 93230c5 0ac78b6 7f3ddf 7bdf1a
- 40. git rebase -i 93230c5 0ac78b6 7f3ddf 7bdf1a
- 41. git rebase -i 93230c5 7f3ddf 7bdf1a
- 42. git rebase -i 93230c5 7f3ddf7bdf1a
- 43. Rebase e Merge
- 44. Trabalho no branch “outro” terminado = commit = branch = HEAD 93230c5 0ac78b6 c77926b 4ebf653 master HEADoutro
- 45. Merge outro = commit = branch = HEAD 93230c5 0ac78b6 c77926b 4ebf653 masterd4545ea HEAD
- 46. Trabalho no branch “outro” terminado = commit = branch = HEAD 93230c5 0ac78b6 c77926b 4ebf653 master HEADoutro
- 47. git rebase master = commit = branch = HEAD 93230c5 0ac78b6 c77926b4ebf653 master HEADoutro
- 48. git rebase master = commit = branch = HEAD 93230c5 0ac78b6 c77926b4ebf653 master HEADoutro39e168
- 49. git checkout master && git merge outro = commit = branch = HEAD 93230c5 0ac78b6 c7792624ebf653 master HEADoutro39e168
- 50. git branch -d outro = commit = branch = HEAD 93230c5 0ac78b6 c7792624ebf653 master39e168 HEAD
- 51. git branch -d outro = commit = branch = HEAD 93230c5 0ac78b6 c7792624ebf653 master39e168 HEAD
- 52. Ammend
- 55. git commit --amend --no-edit 93230c545fa67
- 56. Demo Rebase
- 59. Estou com medo do rebase 93230c5 0ac78b6 7f3ddf 7bdf1a gb/nf HEADmaster = commit = branch = HEAD
- 60. git checkout -b temp 93230c5 0ac78b6 7f3ddf 7bdf1a gb/nfmaster = commit = branch = HEAD temp HEAD
- 61. Após o squash 93230c5 0ac78b6 7f3ddf 7bdf1a gb/nfmaster = commit = branch = HEAD temp HEAD 531d4d0 0ac 78b 6 7f3 ddf 7bd f1a
- 62. Após o reset 93230c5 0ac78b6 7f3ddf 7bdf1a master = commit = branch = HEAD gb/nf HEAD 531d4d0 0ac 78b 6 7f3 ddf 7bd f1a
- 63. git worktree
- 65. Troca de branches padrão ~/projects/myproj gb/fix-login
- 66. node_modules?
- 69. Clone local
- 71. git clone myproj myproj2 93230c5 0ac78b6 master ~/projects/myproj ~/projects/myproj293230c5 0ac78b6 master remote
- 73. git pull ../myproj2 93230c5 0ac78b6 93230c5 0ac78b6 master b8e46ef master b8e46ef
- 74. Cópia local
- 76. cp -R myproj myproj2 ~/p/myproj ~/p/myproj/.git ~/p/myproj/node_modules ~/p/myproj2 ~/p/myproj2/.git ~/p/myproj2/node_modules
- 77. Errou feio, errou rude
- 78. O git grava tudo que você faz no seu repo local Para veja o que foi gravado usando git reflog
- 79. Demo git reflog
- 81. • Em qual commit esse bug entrou? • Há quanto tempo eu tenho esse bug?
- 82. Demo git bisect
- 85. NEW DIRTY Você poderia parar tudo e fazer essa feature nova? DELETED
- 87. git stash
- 88. NEW DIRTY DELETED 932 HEADmaster 932 HEAD master gb/temp 932 HEAD master gb/temp458 git checkout -b gb/temp git commit
- 89. 932 HEADmaster 932 HEAD master gb/temp 932 HEAD master gb/temp458 932 HEADmaster gb/temp458 git checkout -b gb/temp git commit git checkout master
- 109. dicas úteis
- 110. git cherry pick
- 111. git checkout -b branch_novo git checkout branch_original git reset --hard HEAD^
- 112. git --no-pager --git-dir=<original_dir>/.git format-patch -k -1 --no-color --stdout <commit_sha> | git am -3 -k --ignore-whitespace http://bit.ly/copycommit
- 113. st = status ci = commit co = checkout br = branch fixup = commit --all --amend --no-edit open = !explorer `git config remote.origin.url` browse = !git open
- 114. up = push upstream master sync = pull upstream master --rebase which = !git branch | grep -i daily = !sh -c 'git log --since=yesterday -- format=%s --author=Giovanni' serve = daemon --reuseaddr --verbose --base- path=. --export-all ./.git
- 115. hub.github.com git clone seurepo git clone user/repo git browse git browse -- issues git browse user/repo wiki git fork git create git checkout https://github.com/user/repo/pull/123
- 119. w w w. l a m b d a 3 . c o m . b r Obrigado! @giovannibassi /giggio.tech
Editor's Notes
- #23: cd .git cat HEAD cat refs/heads/master ls objects/xx/yyyyy (sendo que xx são os primeiros 2 dígitos do commit, e yyyyy são o restante do SHA) git cat-file –p xxyyyyyyyy git show xxyyyyyyyy ls refs cat refs/remotes/origin/master
- #57: cd C:\p\samplegitrepo git co create101to200 #mostra o merge git merge remove1s #limpa tudo git reset --hard HEAD^ #mostra o squash git rebase -i master #mostra o rebase git rebase remove1s
- #80: cd C:\p\samplegitrepo git checkout create101to200withmanycommitsanderror git reset --hard HEAD^^
- #83: cd C:\p\samplegitrepo git checkout create101to200withmanycommitsanderror git bisect start git bisect bad #rever o log e notar que no master estava ok git log git checkout master git bisect good #checar com: ls | % { $(cat $_).Contains('ERR') } | ? { $_ -eq $true } # fazer varios git bisect bad e good ate achar o commit #mostrar novamente com script git bisect reset git checkout create101to200withmanycommitsanderror-scriptforbisect cp bisect.ps1 \temp git bisect start git bisect bad git checkout master git bisect good git bisect run \temp\bisect.sh