Git - shared insights

What my team and I are doing with Git every day.

Transcript

1. Git shared insights
2. Agenda • Git tools • Git config, Git config files • Gitignore files • Branching, merging, rebasing • Pulling • Squashing, amend commit • Git Workflow, Feature Branch Workflow • Workflow of my team • Demo • Hints
3. Git tools (Bitbucket)
4. Git tools (Sourcetree)
5. Git tools (IntelliJ)
6. Git tools (Visual Studio Code)
7. Git tools (Terminal)
8. # Lists the git config git config -l git config --global -l # Sets colored output git config --global color.ui auto # Sets converting of LF endings into CRLF git config --global core.autocrlf input # for mac and linux git config --global core.autocrlf auto # for windows # Sets user details git config --global user.name "Markus Hanses" git config --global user.email "markus.hanses@gmail.com" Git config
9. Git config files cat ~/.gitconfig cat repo/.git/config [user] name = Markus Hanses email = markus.hanses@immonet.de [core] excludesfile = .gitignore_global autocrlf = input [color] ui = auto ... [core] ... [remote "origin"] url = ... fetch = ... [branch "master"] remote = origin merge = refs/heads/master ...
10. Gitignore files cat ~/.gitignore_global cat repo/.gitignore *~ .DS_Store ... /.idea *.iml /build /**/*log ...
11. branching 1/2 (create) git checkout -b feature_one git add . git commit -m “Your message” git push --set-upstream origin feature_one
12. branching 2/2 (delete) git branch -d feature_four git push origin --delete feature_four
13. Merging (fast forward) git checkout master git merge -ff feature_one git push
14. Merging (No fast forward) git checkout master git merge --no-ff feature_four -m 'add new feature' git push
15. Rebasing git checkout feature_eight git rebase master git push -f #! rebase onto master
16. Pulling (merge) git pull # git fetch & git merge Quelle: https://de.atlassian.com/git/tutorials/syncing/git-pull
17. Pulling (Rebase) git pull --rebase # git fetch & git rebase
18. Squashing 1/2 time
19. Squashing 2/2 git rebase -i 18c1a589b65 git push -f
20. Mini Squashing (amend commit) git add . git commit --amend -m “Typo corrected”
21. Git Workflow Quelle: https://de.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow
22. Feature Branch Workflow Quelle: https://github.com/IntegratedBreedingPlatform/Documentation/wiki/Git-Workflow
23. Workflow of my team 1/2
24. Workflow of my team 2/2
25. Demo Time
26. Hints 1/2 (Save time) # Sets the push strategy to 'use the same name on remote' git config --global push.default simple # Deletes local references for deleted remote branches git config --global fetch.prune 1 # Store passwords in MAC OS password manager git config --global credential.helper osxkeychain # Create an alias for an compressed log output git config --global alias.ultimate-log "log --graph --oneline --decorate"
27. Hints 1/2 (Clean repository) # Removes all merged local branches, but 'master' branch git branch | grep -v "master" | xargs git branch -d # Removes all remote branches, merged into master git branch -r --merged master | \ ack -v master | \ sed -e 's/\// :/' | \ xargs -n2 git push
28. Recommended sources • GIT Website, https://git-scm.com/docs • Bitbucket Website, https://de.atlassian.com/git/tutorials • Git in Practice, Mike McQuaid, Manning • Pro Git 2nd Edition, Scott Chacon and Ben Straub, apress
29. git reset -hard
30. end of presentation Author: Markus Hanses Date: 2018-12-20