Reference · 17 terms
Glossary
Every short form used across the series. Inside a lesson, hover or tap any dotted term to see the same entry in place.
Git
- .gitignore.gitignore
- A file listing paths Git should not track, such as node_modules and build output.Lesson 1 →
- branchBranch
- A movable pointer to a commit. Creating one is cheap because it is just a name.Lesson 0 →
- CODEOWNERSCODEOWNERS
- A file that names who must review changes to which paths.Lesson 5 →
- commitCommit
- A saved snapshot of your project with a message and a pointer to its parent commit.Lesson 0 →
- fast-forwardFast-forward merge
- A merge that only moves a branch pointer forward because there is no divergent work.Lesson 2 →
- fetchgit fetch
- Download new commits from a remote without changing your files or branches.Lesson 3 →
- force-with-lease--force-with-lease
- A safer force push that fails if someone else pushed since you last fetched.Lesson 5 →
- HEADHEAD
- A pointer to where you are now, usually the tip of the current branch.Lesson 0 →
- merge conflictMerge conflict
- Two changes touch the same lines, so Git asks you to choose the result.Lesson 2 →
- pull requestPull request
- A request to merge a branch, with a place for review and discussion.Lesson 3 →
- rebaseRebase
- Replay your commits on top of another base to make history linear.Lesson 5 →
- reflogReflog
- A private log of where HEAD and branches have been. It can recover commits that look lost.Lesson 4 →
- remoteRemote
- Another copy of the repository, usually on a server. 'origin' is the default name.Lesson 3 →
- resetgit reset
- Move the current branch to another commit, and optionally change the index and files.Lesson 4 →
- revertgit revert
- Make a new commit that undoes an earlier commit, without rewriting history.Lesson 4 →
- staging areaStaging area (index)
- The place where you collect the changes that will go into the next commit.Lesson 0 →
- working treeWorking tree
- The files you see and edit on disk.Lesson 0 →