Git flash cards: Journeyman level

60 Git terms at the Journeyman level, as flash cards.

Updated

Terms in this deck

Ancestor
An earlier commit reachable by repeatedly following parent links.
Bisect bad revision
A revision marked as containing the problem being investigated.
Bisect good revision
A revision marked as not containing the problem being investigated.
Caret revision syntax
Revision syntax that selects a parent or excludes commits from a set.
Client-side hook
A hook that runs in a contributor's local repository.
Commit graph
The connected structure formed by commits and their parent relationships.
Commit hash
A hexadecimal identifier used to refer to a particular commit object.
Commit-msg hook
A client-side hook that can inspect or reject a proposed commit message.
Common ancestor
A commit reachable from each of two or more commits by following parent links.
Context line
An unchanged line included around a change to show where the change belongs.
Descendant commit
A later commit that can reach another commit by following its parent links.
Detached HEAD
A state in which HEAD points directly to a commit instead of to a branch.
Diff hunk
A grouped section of nearby changed lines in a diff.
Drop a commit
Removes a selected commit while rewriting history during an interactive rebase.
Fixup
Combines a commit with an earlier commit while normally discarding the fixup commit's message.
Force push
A push that permits a remote branch to lose commits not present in the proposed update.
Force with lease
A guarded force push that fails if the remote reference no longer has the expected value.
git am
Applies mailbox-formatted patches and creates commits from them.
git apply
Applies changes from a patch to files without creating a commit.
git bisect
Uses binary search through history to help find the commit that introduced a problem.
git blame
Shows which commit and author last changed each line of a file.
git cherry-pick
Applies the changes introduced by selected commits as new commits on the current branch.
git clean
Removes selected untracked files or folders from the working tree.
git format-patch
Creates email-ready patch files from commits.
Git hook
A program Git runs when a particular repository event occurs.
git rebase
Replays commits onto a new base and replaces them with newly created commits.
git reflog
Shows recent updates to local references, including earlier positions of HEAD and branches.
git reset
Moves a branch or adjusts the index and working tree to match a selected commit, depending on its mode.
Hard reset
A reset that moves the current branch and replaces tracked index and working-tree content.
HEAD
The reference that identifies the currently checked-out branch or commit.
Hunk header
The line that identifies the old and new line ranges covered by a diff hunk.
Interactive rebase
A rebase that lets you reorder, combine, edit, rename, or remove selected commits.
Merge base
A best common ancestor used as the starting point for a merge.
Mixed reset
A reset that moves the current branch and resets the index while leaving working-tree files unchanged.
Object ID
The hash-based identifier Git uses to name an object.
Ours
The version associated with the current side of a merge, though its exact meaning can vary by operation.
Parent commit
A commit named by a later commit as its immediate history.
Patch
A text representation of changes that can be reviewed, shared, or applied.
Pre-commit hook
A client-side hook that runs before Git creates a commit.
Pre-push hook
A client-side hook that runs before objects and reference updates are sent to a remote.
Rebase todo list
The ordered instructions Git follows during an interactive rebase.
Ref
Git's short term for a reference such as a branch, tag, or remote-tracking branch.
Reference
A stored name that points to an object ID, usually a commit.
Reflog entry
A local record of one update made to a reference.
Relative reference
A reference expression that selects another commit relative to a known reference.
Revision
A commit or other object selected by a revision expression.
Revision range
An expression that selects commits by describing relationships between revisions.
Reword
Changes a commit message while keeping the commit's file changes.
Root commit
A commit with no parent, normally representing the beginning of a repository's history.
Server-side hook
A hook that runs in a repository receiving network operations.
SHA
An informal name for a Git object ID, based on the hash algorithms Git has historically used.
Signature verification
The process of checking that a Git signature is valid and associated with a trusted identity.
Signed commit
A commit containing a cryptographic signature that can be checked against its contents.
Signed tag
An annotated tag containing a cryptographic signature.
Soft reset
A reset that moves the current branch while leaving the index and working tree unchanged.
Squash
Combines a commit with the preceding commit during an interactive rebase.
Symbolic reference
A reference that points to another reference rather than directly to an object ID.
Theirs
The version associated with the other side of a merge, though its exact meaning can vary by operation.
Three-way merge
A merge that compares two branch tips with their common ancestor.
Tilde revision syntax
Revision syntax that follows a commit's first-parent chain a chosen number of times.

Read them in the glossary