Gitting things done - Git Basics
Download as pptx, pdf0 likes64 views
The document provides an overview of Git, covering topics such as the structure of the .git directory, essential Git commands, and terminology. It discusses concepts like branches, merging, rebasing, and the code review process, including UI tools like gitk and git-gui. Additionally, it highlights methods for cleaning branch history and managing merge requests.
![GIT GLOSSARY
Refs Local branches, Remote branches, Tags
Upstream [Also Upstream branch]
Working directory Staging area (Index) Local repo Upstream repo
Working Tree
HEAD, HEAD^, HEAD~
Change set
Author, Committer
Working directory: Clean Vs Dirty
Object
Pack
Next](https://image.slidesharecdn.com/gittingthingsdone-180511061107/85/Gitting-things-done-Git-Basics-4-320.jpg)
Gitting things done - Git Basics
- 2. TOPICS Exploring .git directory Git Terminology Git commands Cleaning branch history Interactive rebase UI tools (gitk, git-gui, git-extensions) Merge Requests & Code Review Process
- 3. .GIT DIRECTORY Hooks Config Info/exclude Logs Objects Refs $ tree -d .git .git |-- hooks |-- config |-- info |-- logs | `-- refs | |-- heads | `-- remotes | `-- origin |-- objects | |-- info | `-- pack `-- refs |-- heads |-- remotes | `-- origin `-- tags
- 4. GIT GLOSSARY Refs Local branches, Remote branches, Tags Upstream [Also Upstream branch] Working directory Staging area (Index) Local repo Upstream repo Working Tree HEAD, HEAD^, HEAD~ Change set Author, Committer Working directory: Clean Vs Dirty Object Pack Next
- 6. GIT COMMANDS Config, Remote, Clone, Checkout Status, Add, Commit, Show, Amend, Revert Merge, Rebase Fetch, Pull Push Next
- 8. GIT MERGE - FF Next branch1 branch2 branch1 Merge branch2 into branch1 branch1
- 9. GIT MERGE NON FF Back branch1 branch2branch1 Merge branch2 into branch1 branch1
- 14. GIT COMMANDS Log Reset (Soft, Hard) Stash Cherry-pick Reflog Next
- 18. INTERACTIVE REBASE $ git rebase i HEAD~5 Cleaning branch history
- 19. GIT GUI Gitk Git-gui Git Extensions ??
- 20. Test
- 21. CODE REVIEW Code Review guidelines Merge Requests
- 23. Questions?
- 24. Thank You!
Editor's Notes
- #5: Refs references. All your branches, tags etc. Something that can refer to a commit HEAD A reference to the current commit. It also is a reference to the snapshot of the entire git tree at the current stage