Photo by Yosuke Ota on Unsplash

On this page

Companion to Git cheat sheet and the Git and GitHub series.

Blob

Immutable stored file content addressed by hash. See How Git works.

Branch

Named pointer to a commit; moves forward on new commits. See Everyday Git commands.

Cherry-pick

Apply an existing commit’s changes as a new commit on the current branch. See Undoing and moving changes.

Commit

Snapshot of the project at a point in time; links to parent(s) and a tree. See How Git works.

Distributed version control

Every clone holds full history; sync via remotes. See A short history of Git.

Fast-forward merge

Moving a branch pointer forward when no divergent commits exist. See Merging versus rebasing.

Fetch

Download objects and refs from a remote without merging into the current branch. See Working with remotes.

Reference to the current branch (usually) and thus the current commit. See How Git works.

Index (staging area)

What the next commit will contain; between working tree and repository. See How Git works.

Merge commit

Commit with two parents integrating two lines of history. See Merging versus rebasing.

Origin

Default name for the primary remote after clone. See Working with remotes.

Pull request

Proposal to merge one branch into another on a host such as GitHub. See Pull requests with and without GitHub.

Rebase

Replay commits onto a new base; rewrites commit hashes. See Merging versus rebasing.

Reflog

Log of where refs pointed locally; recovery aid after reset. See Advanced Git.

Remote

Named URL or path for another copy of the repository. See Working with remotes.

Revert

New commit that undoes a prior commit without erasing history. See Undoing and moving changes.

Stash

Temporary stack of uncommitted changes. See Undoing and moving changes.

Tree

Directory listing object pointing at blobs and subtrees. See How Git works.

Trunk-based development

Single long-lived main branch with frequent small merges. See Git workflows for teams.

Pull request hygiene

Practices that keep reviews small, test-backed, and easy to merge. See Code review and pull request hygiene.

Upstream branch

Remote-tracking branch paired with a local branch for push/pull. See Working with remotes.

Workflow (GitHub Actions)

Automated jobs triggered by repository events. See GitHub Actions.

Search articles

Type a word to search published articles.

Open the search page