Advanced Git - git basic, git better, git good

Transcript

1. Advanced Git Git basic, git better, git good Mart de Graaf Software Engineer devNetNoord 29 september 2022
2. Mart de Graaf Software Engineer Nieuwsgierig en gedreven. Mart-de-graaf martdegraaf martdegraaf
3. Git basic What is git? Do not learn (all) the commands, learn the model.
4. Git - commits C1 C2 C3 My.Cool.WebApp ┣ My.Cool.WebApp.csproj ┣ appsettings.Development.json ┣ appsettings.json ┣ appsettings.Local.json ┣ appsettings.ServiceOverrides.json ┣ Program.cs ┗ Startup.cs My.Cool.WebApp ┣ My.Cool.WebApp.csproj ┣ appsettings.json ┣ Program.cs ┗ Startup.cs My.Cool.WebApp ┣ My.Cool.WebApp.csproj ┣ appsettings.Development.json ┣ appsettings.json ┣ Program.cs ┗ Startup.cs
5. Git – snapshot
6. Git – commit
7. Git - branches
10. .git folder
11. .git folder /objects
14. Git - Areas Git add {file} Git commit Git checkout? A A A B B B C C
15. Git checkout! C C Master My-branch HEAD
16. File stages
17. Git Stash Git stash pop Git stash
19. Git Good
20. Git workflows • Feature branching Workflow • Release branching Workflow • Gitflow Workflow
21. Git feature branching Handige naamgeving hiervoor is bijv: feature/[teamlid-naam]/[feature-naam], ofwel feature/mart/add-readme
22. Git release branching
23. Gitflow
24. Git is tooling, afspraken zijn nodig Voorbeelden van teamafspraken kunnen zijn: • Rebase, don’t merge / Merge don’t rebase • Only developer X can do Y on branch Z • Don’t push to a red build • Squash a feature to a single commit before merge to master
25. Git Fork
26. Git Fork Commit Ids Commit Authors
27. Git Fork Repository Stashing Area
28. Git better Git stash Merge vs Rebase
29. Git Merge
30. Git Rebase
31. Git Better, merge vs rebase Never rebase shared commits
32. Git Fork - rebase
33. Nutshell
34. git status git init git commit git diff git log git branch git merge git rebase git checkout git push git pull git add git mv git fetch git stash git clone git reset git config https://www.linkedin.com/in/mart-de-graaf/
35. Git me a specific case We need some specific cases…
36. Git case: Soo many local branches git remote prune ^^ squased?? git branch --merged | grep -v "master" >/tmp/merged-branches && vi /tmp/merged-branches && xargs git branch -d </tmp/merged-branches https://stackoverflow.com/questions/7726949/remove-tracking-branches-no-longer-on-remote
37. Git case: Apply gitignore rules git rm --cached <file>
38. Azure Devops commit compare https://dev.azure.com/[env]/[project]/_git/[repo]/branchCompare ?baseVersion=GBmaster&targetVersion=GBhotfix/reservation-summary&_a=commits ?baseVersion=GC4a42a74961f6f55acd9a1d5fb34b6ccb88bc68c8&targetVersion=GBmaster&_a=commits Key Type GB Branch GC Commit GT tagname
39. Git branch rename If you want to rename a branch while pointed to any branch, do: git branch -m <oldname> <newname> If you want to rename the current branch, you can do: git branch -m <newname>
40. Powershell script tool voor openstaande Branches/ PR’s https://github.com/sven73a/Powershell-Utils-Azure
41. Let’s PRACTISE! http://onlywei.github.io/explain-git-with-d3/
42. • git clone git@github.com:foo/bar.git • cd bar • # edit • git commit -a -m "foo" • git push • svn checkout svn://foo.com/bar bar • cd bar • # edit • svn commit -m "foo" • Git • SVN Git vs SVN
43. • git show HEAD^ • git show HEAD~2 • git diff HEAD..HEAD^^ • git blame package.json • git log --graph --decorate –oneline • git show HEAD • git log --author=“Mart" • git commit –amend • git rebase –I • git reflog • git revert HEAD • Git log Git Log practise