This should provide quick access to key terms used in the tutorials.
- Glossary
- Contents
- Git Basiscs Terms
- git
- commit
- history
- repository
- objects
- GitLab
- GitHub
- diff
- tree
- index
- SHA-1 hash
- branch
- tag
- staging area
- state
- checkout
- local repository
- remote repository
- remote
- push
- pull
- fork
- upstream
- origin
- merge
- config
- init
- clone
- status
- gitignore
- switch
- log
- fetch
- fast-forward
- conflict
- rebase
- cherry-pick
- reset
- stash
- [blame]
- Git Basiscs Terms
- References
This list of terms is organized in the order that they will first be mentioned in the Git Basics Tutorial
A version/revision control system that tracks changes on/in files and directories
A record of changes identified by a hash
A series of commits in chronological order
A database of objects. Generally a directory with a .git directory, or when hosted on a web, a url ending with .git
Key/pair values that represents data in the repository. Objects are stored in .git/objects.
A platform where repositories can be hosted. The primary git platform used by the USGS
A platform where repositories can be hosted. The primary git platform used by the DOI.
A visual representation of the changes between what you are currently working on (tree) and what is already in the history (or index)
A list of filenames and reference to their data
A collection of files and their status. Used to determine changes when merging. Often called the staging area
Hash used to identify files, commits, and all other objects in a git repository.
A workspace parallel to your default workspace (often called the main branch), where you can make and track changes
A reference to a specific point in the history of code changes (commit), with a user defined name (often a version number)
Where commits can be reviewed prior to being committed
Statuses that files can have. The three main states are modified, staged, and committed
- "modified": changes were made but they have not been committed to your repository yet
- "staged": you have marked the modifications to be added upon the next commit
- "committed": the data has been added to your repository and is now in the history
- "untracked": files that have not been added to your repository (via a commit)
A command used to switch between branches or restore a modified file (undo all changes on file)
A repository on a local machine (laptop, desktop, vm) that is a directory with a .git folder. This may be pointing to a remote repository hosted on a git platform (GitLab/GitHub)
A repository hosted on a git platform (GitLab/GitHub)
Reference to the url of remote repository where you can push to and pull from
Update a remote repository with objects from the local repository
A command that joins two branch histories (usually without a commit message). Generally a user will use pull to get commits from a remote repository or local branch into the current branch
A copy of a repository on a git platform that is also hosted on the same git platform, generally under a personal user space
A name that refers to a stable or shared repository (or branch) that an individual can fork from
A name that refers to the default upstream branch. By default, when cloning a repository, this is set as that remote repository. In general, this is a fork of an upstream repository.
Joining two branch histories with a commit
A file containing all default and custom configuration. At a minimum, it holds the information about who is making commits
A commend to setup an empty repository. It can also be run to get new templates for newer versions of git or move an existing repository
Copy a repository into a directory
Display the working tree; display each changed, new, or deleted file and its state
A list of file that should always be in an untracked state. Generally custom ignore specifications are added in a .gitignore file at the top level of the repository
A command to switch to a specified branch
Display of history of commits
Download objects from another repository
A merge that moves the pointer of the target branch forward to the latest commit of the source branch (the branch merging into the target branch). This cannot be done when the history of the target and the source branch have diverged or when there are conflicts
When two lines of code, files, etc. have been changed by both the source and target branch of a merge or rebase
A way to combine changes from two branches
Apply the changes of specific commits
Undo changes to a previous state
Undo all current changes, but add them to a list that can be used to apply the changes to a branch later
Show the author of each revision by line