Git Glossary
A quick reference to the most common Git and GitHub terms you’ll encounter in this workshop.
🔤 Alphabetical Index
🗂 Repository Basics
Repository (repo)
A project folder that Git tracks. It contains your files and the entire history of changes.
See also: Local Repository, Remote Repository.
Local Repository
The copy of the repository on your computer. This is where you make changes before you push them.
Remote Repository
The copy of the repository hosted on a service like GitHub or GitLab, usually shared with others.
See also: Push, Pull, Clone.
Git
The underlying version control system. GitHub Desktop is just a friendlier interface to it.
GitHub / GitLab
Websites that host remote repositories and provide collaboration features like pull requests, issues, and wikis.
GitHub Desktop
A graphical application for using Git and GitHub without the terminal.
It lets you clone, commit, push, pull, create branches, and manage pull requests through a point-and-click interface.
Main Branch
The default branch in most repositories. It usually represents the “official” project history.
Fork
Your personal copy of someone else’s repository on GitHub. Useful for contributing to open source projects.
✍️ Working with Changes
Stage
The step before committing. You choose which changes you want to include in the next commit. In GitHub Desktop, this is done by checking the boxes next to changed files.
Commit
A saved snapshot of your project at a point in time. Think of it as a “save point” in a game. Each commit has a unique ID and a message describing the changes.
Commit Message
A short description you write when making a commit.
It explains why you made the change.
Good commit messages make it easier for you (and teammates) to understand the history later.
In GitHub Desktop, you’ll see a box for the summary (short title) and an optional description.
History (Log)
The list of past commits. In GitHub Desktop, you can view this in the History tab.
Restore / Discard
Throw away uncommitted changes and return files to their last committed state.
Revert
Undo a commit by creating a new commit that cancels it out. The history stays intact.
Branch
A separate line of development. Often used to work on a feature without touching the main branch.
See also: Merge, Pull Request.
Merge
Combine changes from one branch into another.
Merge Conflict
Happens when Git can’t automatically merge changes. You’ll need to choose which version to keep.
📄 Project Files & Config
.gitignore
A file that tells Git which files or folders to ignore (e.g. temporary files, build artifacts).
README
A file (usually README.md
) that explains what a project is, how to use it, and other helpful info.
License
A file that tells others how they are allowed to use or share the project.