Git from the trenches
Download as PPTX, PDF0 likes225 views
This document provides an overview of Git, including definitions of distributed vs centralized version control, the staging area, basic Git commands, branches and tags, integrating feature branches, resolving conflicts, interactive rebasing, keeping history clean, additional tools like cherry-pick and blame, reflogs as a safety net, bisecting to find bugs, and customizing behavior with hooks. It also includes demonstrations of basics, branching strategies, and resolving conflicts.
More Related Content
What's hot (20)
Similar to Git from the trenches (20)
More from Nuno Caneco (8)
Recently uploaded (20)
Git from the trenches
- 2. git from the trenches netponto - 2017-10-28 Nuno Caneco
- 4. git Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency. https://git-scm.com/ Git (slang) Git is a term of insult with origins in British English denoting an unpleasant, silly, incompetent, stupid, annoying, senile, elderly or childish person. (...) Typically a good-natured admonition with a strong implication of familiarity, git is more severe than twit or idiot but less severe than wanker, arsehole or twat when offence is intended. https://en.wikipedia.org/wiki/Git_(slang)
- 5. Distributed vs Centralized Centralized ● Server owns the database ● Workstations have working copies ● Workstations commit to server ● Server is single source of true commit get latest version commit commit commit push pull Distributed ● No server ● Each workstation has its own database and working copies ● Workstations commit to self database ● Workstations push and pull commits between them workstation3 workstation1 workstation2 workstation1 workstation2 workstation3 server
- 6. But we still need servers, so... commit commit commit push pull workstation1 workstation2 workstation3 origin
- 7. What's a git commit? metadata commit message content (diff)
- 8. git commit ID SHA-1 ● Metadata ○ Commit message ○ Commit date ○ Committer ○ Author date ○ Author ● Content ○ Tree (the diff) ○ Parent commits
- 9. Writing good commit messages Add missing calls to open connection to database When using Database.CreateConnection() method, the connection is not opened by default. So, a call to .Open() was being required before using the connection retrieved. This commit adds the missing calls to the .Open() method on the UsersDB class. Issue #287 GitHub links both ways: Commit → Issue Issue → Commit Start with a verb; use imperative tense. 60 chars max https://git-scm.com/book/en/v2/Distributed-Git-Contributing-to-a-Project
- 10. Staging area
- 11. git basic commands git clone - Clones a repository to a new directory git checkout - Switch branches or restore working tree files git checkout -b <BRANCH> - Create a new branch and switch to it git add <FILE> - Adds changes in <FILE> to the staging area git commit - Commits the changes in the staging area git push - Sends the current branch to a remote repository git pull - Gets changes from a remote repository
- 12. DEMO - Basics
- 13. Tags and branches Tags and Branches are pointers to a commit These pointers can be changed over time Branch feature1 → C4 Tag v1 → C2 Detached commit master → C6 v2 → C6
- 14. Start with master branch feature1 Branch per feature Create a branch to implement a feature Integrate the feature to master branch master master master master
- 15. Integrating a feature branch Several strategies can be applied: ● Merge only ● Rebase and merge ● Squash and merge DEMO WARNING: There are different opinions on the branch integration strategy among the community. You should discuss the approach with the Team to come up whatever you feel comfortable with.
- 16. History Merge and merge Rebase and merge
- 18. Interactive Rebase git rebase -i Allows you to go back and edit the history DEMO
- 19. Keeping history clean ● It's OK to rewrite history feature branches ○ This will ensure a clean history ● Make sure to protect branches that should not be changed ○ master ○ Environment branches: production / QA ○ Release branches
- 20. Some more fun stuff you can do
- 21. git cherry-pick git cherry-pick <COMMIT ID> Apply the changes introduced by some existing commits DEMO
- 22. git blame Show what revision and author last modified each line of a file Important to track down changes and troubleshooting WARNING: The merge strategy can make your life a bit harder to use blame, because the last edit of a line might be a merge commit, which you need to follow to find the original commit that introduced that change. This is one argument in favour of the merge-rebase strategy
- 23. git reflog - your safety net git reflog Reflog tracks every change on the local repository. It's possible to git checkout to any commit on the reflog.
- 24. git bisect Use binary search to find the commit that introduced a bug ✘✔ The bug was introduced by one of these commits ✔ ✘✔ DEMO
- 25. git hooks Allows you to customize git behavior λ ls .git/hooks applypatch-msg.sample commit-msg.sample post-update.sample pre-applypatch.sample pre-commit.sample pre-push.sample pre-rebase.sample pre-receive.sample prepare-commit-msg.sample update.sample