Git Tips

Some tips for the intermediate Git user, presented initially at the first Kickstart.mv Tech Talks

Transcript

1. GIT TIPS @mzahir GIT TIPS
2. Musannif Zahir (Muchi)
3. GIT TIPS? • Git Rebase
4. GIT TIPS Quick tips on boosting your productivity with Git. Introductions to the popular git functionality and the more magical, complex git operations to make source control and code sharing hassle- free.
6. GIT FLOW Vincent Driessen
8. REVIEW REVIEW
9. REBASE
10. REBASE •Similar, but different •Modify timeline
11. REBASE •git rebase master •manually fix conflict •git add file •git rebase —continue
13. SQUASH Clean commit log git rebase -i HEAD~10
14. PULL? •git fetch + git merge (current branch) •Manual •git pull —rebase
15. ROLLBACK •git reset --soft HEAD~1
16. TIPS TIPS
17. TYPO!! •git commit --amend -m “fixes the queen’s english"
18. ALIASES ~/.gitconfig Convenience Clarity
19. AUTOCORRECT •git config —global help.autocorrect 1
20. TRICKS TRICKS
21. HISTORICAL SEARCH •git log -Ssecret_key
22. CI WOES
24. CI WOES git commit --amend -C HEAD; git push -f origin branchname
25. GITCEPTION
26. GITCEPTION Restrict Access ! Reusability
27. TOOLS TOOLS
28. HUB pull-request fork create browse compare ci-status
29. GOURCE https://code.google.com/p/gource/
30. QUESTIONS QUESTIONS