THE CORE AIM OF VOCABULARY MASTERY · GIT VOCABULARY · WORKTREE → STAGE → COMMIT → BRANCH → MERGE
Git vocabulary is the language used to describe how source-code changes are recorded, compared, branched, merged and shared. Terms such as repository, working tree, staging area, commit, branch, merge, rebase, remote, fetch and pull matter because version control becomes much easier once each word is attached to a specific state or operation.
The core aim of vocabulary mastery for Git vocabulary is history clarity. Learners should be able to explain where a change currently lives, whether it has been staged or committed, how branches diverge and reconnect, and how local history relates to remote repositories.
This page is the Git Vocabulary owner inside the eduKateSG Vocabulary hub. For the broader lifecycle, use Software Development Vocabulary. For deployment practices, use DevOps Vocabulary.
Central proposition: Git vocabulary is mastered when the learner can say where a change is, what history operation is happening and what effect that operation will have.
The 60-Second Git Vocabulary Router
- Repository: repo, working tree, local, remote.
- Change: modified, staged, unstaged, tracked, untracked.
- History: commit, hash, parent, HEAD.
- Branches: branch, checkout, switch, merge, rebase.
- Remote work: clone, fetch, pull, push, upstream.
- Recovery: revert, reset, restore, conflict.
The Git Vocabulary Architecture
| Layer | Core terms | Core question |
|---|---|---|
| Working state | modified, staged, untracked | Where is the change now? |
| History | commit, hash, HEAD | What has been recorded? |
| Branching | branch, merge, rebase | How do histories diverge and reconnect? |
| Remote | fetch, pull, push | How do local and remote repositories exchange history? |
| Conflict | merge conflict, resolution | What happens when changes cannot combine automatically? |
| Recovery | revert, reset, restore | How do we safely undo or move state? |
Commit Is Not the Same as Push
A commit records changes in the local repository history. A push sends local commits to a remote repository. Beginners often confuse the two because both feel like “saving,” but they affect different places.
A Worked Example: Fetch vs Pull
Fetch downloads remote history without automatically integrating it into the current branch. Pull usually fetches and then integrates remote changes according to configuration. The exact behaviour can vary, so understanding the sequence matters.
A Worked Example: Merge vs Rebase
A merge combines histories and may create a merge commit. A rebase rewrites a sequence of commits onto a different base. Both can integrate work, but they produce different history shapes and collaboration implications.
Git Vocabulary and Conflicts
A merge conflict occurs when Git cannot automatically reconcile competing changes. Vocabulary such as ours, theirs, base, conflict marker and resolution helps learners describe what they are actually choosing.
How to Learn Git Vocabulary
- Use a small practice repository.
- Watch git status before and after every operation.
- Draw commit graphs.
- Compare fetch, pull and push directly.
- Create safe merge conflicts and resolve them.
- Use revert before experimenting with destructive history changes.
- Explain HEAD, branch and commit aloud while navigating history.
Common Git Vocabulary Mistakes
Confusing commit and push
Repair: separate local history from remote transfer.
Treating branch as a folder
Repair: think of a branch as a movable reference to a commit history.
Using reset, restore and revert interchangeably
Repair: learn what state each command changes and whether history is rewritten.
Rebasing shared history casually
Repair: understand history rewriting before using rebase on collaborative branches.
Frequently Asked Questions
What is Git vocabulary?
It is the specialised language used to describe repositories, commits, branches, staging, merges and remote version control.
What Git terms should beginners learn first?
Start with repository, working tree, staged, commit, branch, merge, remote, fetch, pull and push.
What is HEAD?
HEAD is Git’s reference to the currently checked-out commit or branch position.
What is the difference between fetch and pull?
Fetch downloads remote history; pull usually fetches and then integrates it into the current branch.
How can I learn Git vocabulary?
Use a small repository and observe how status and commit history change after every command.
Where This Article Fits in the eduKateSG Vocabulary Ecosystem
- Vocabulary Hub — the broad route.
- Software Development Vocabulary — development lifecycle.
- DevOps Vocabulary — delivery pipelines.
- Programming Vocabulary — code concepts.
- Professional Vocabulary — collaboration.
The Git Vocabulary Standard
Git vocabulary reaches its core aim when the learner can look at a repository and explain the current state, history, branch relationships and remote synchronization without guesswork.
That is the standard: version-control language precise enough to make history understandable.