Git flash cards: Apprentice level
51 Git terms at the Apprentice level, as flash cards.
Updated
Terms in this deck
- Abort an operation
- Stops an in-progress Git operation and tries to return the repository to its earlier state.
- Ahead
- A branch is ahead when it contains commits that its comparison branch does not contain.
- Annotated tag
- A tag stored as its own object with a message, tagger details, and optional signature.
- Behind
- A branch is behind when its comparison branch contains commits that it does not contain.
- Branch name
- The human-readable name used to refer to a branch.
- Branch tip
- The latest commit currently identified by a branch.
- Centralized Version Control
- A version control model where one central server holds the project's only full history.
- Commit amendment
- Replacing the latest commit with a new commit containing corrected content or metadata.
- Conflict marker
- Text Git places in a conflicted file to show the competing versions that must be resolved.
- Conflict resolution
- The chosen final content that replaces competing changes in a merge or rebase conflict.
- Continue an operation
- Resumes a paused Git operation after required conflicts or edits have been completed.
- Discard changes
- Replaces uncommitted edits with a chosen recorded version, permanently removing those edits.
- Diverged branches
- Branches that each contain commits missing from the other branch.
- Executable bit
- A tracked permission flag indicating that a file should be treated as executable on supporting systems.
- Fast-forward merge
- A merge completed by moving the current branch forward because it has no separate new commits.
- Feature branch
- A branch used to develop one feature separately from the main line of work.
- Fetch
- The operation that downloads new objects and reference information from a remote.
- git branch
- Lists, creates, renames, or deletes branches without switching the working tree.
- git checkout
- Restores selected files or switches branches using Git's older multipurpose command.
- git fetch
- Downloads objects and references from a remote without changing the current branch.
- git merge
- Combines changes from another line of development into the current branch.
- git mv
- Moves or renames a path and stages the resulting changes.
- git pull
- Fetches from a remote and then integrates the fetched branch into the current branch.
- git push
- Sends local objects and reference updates to a remote repository.
- git remote
- Views and manages the saved names and URLs of remote repositories.
- git restore
- Restores file contents in the working tree or removes changes from the staging area.
- git revert
- Creates a new commit that reverses changes introduced by an earlier commit.
- git rm
- Removes a tracked path from the working tree and stages the removal.
- git stash
- Temporarily stores selected uncommitted changes and returns those files toward a clean state.
- git stash apply
- Applies a stash entry while keeping the entry in the stash.
- git stash drop
- Deletes a selected stash entry without applying it.
- git stash pop
- Applies the latest or selected stash entry and removes it if the application succeeds.
- git switch
- Changes the current branch or creates and switches to a new branch.
- git tag
- Lists, creates, verifies, or deletes tags.
- Lightweight tag
- A tag that stores only a reference to an existing object.
- Merge commit
- A commit with multiple parents that joins lines of development.
- Merge conflict
- A situation in which Git cannot safely combine competing changes without a person's decision.
- Origin
- The default remote name Git usually creates when a repository is cloned.
- Push
- The operation that sends local commits and reference updates to a remote.
- Remote
- A saved name and URL for another Git repository.
- Remote repository
- A repository known through a URL and commonly used to exchange commits with other copies.
- Remote URL
- The location Git uses to contact a remote repository.
- Remote-tracking branch
- A local reference that records the last known position of a branch in a remote repository.
- Revert commit
- A commit whose changes reverse all or part of another commit.
- Stash entry
- One saved set of uncommitted changes in the stash.
- Tag
- A named reference commonly used to mark one important point in history.
- Topic branch
- A short-lived branch used for one focused change, such as a feature or bug fix.
- Tracking branch
- A local branch configured with an upstream branch for status, pull, and push operations.
- Unstage
- Removes changes from the staging area while normally leaving the working-tree edits in place.
- Upstream branch
- The branch a local branch is configured to compare with and normally pull from.
- Upstream remote
- A remote treated as the source repository from which changes are received.