No Title

Terminology

  • Branch: Branches allow different sets of changes to co-exist. In this way, multiple people can work on the same (set of) files, and different "themed" changes can be developed in isolation. The main branch, from which all other branches (indirectly) are derived is often called "trunk". In practice this is done by having multiple commits (see below) point to the same parent commit. Branches are usually intended to "merge" back into the main branch or trunk.
  • Commit (noun): A commit or changeset is a set of alterations packaged together, along with meta-information about the alterations. A commit/changeset describes the exact differences between two successive versions in the version control system's repository of changes along with information about the context of these changes, e.g. author, date, description (commit message) and a pointer to the parent commit.
  • Commit (verb): To write the changes made in a working copy into the repository using a "commit (noun, see above)".
  • Pull/push: Copy revisions/commits from one repository into another. Pull is initiated by the receiving repository, while push is initiated by the source. Fetch is sometimes used as a synonym for pull, or to mean a pull followed by an update.
  • Pull/merge request: Contributions to a source code repository that uses a distributed version control system are commonly made by means of a pull request or merge request (synonyms). The contributor requests the project maintainer to pull their changes, hence the name "pull request". The maintainer has to merge the pull request if the contribution should become part of the source base.
  • Repository: In version control systems, a repository is a data structure that stores metadata for a set of files or directory structure.
  • Working copy: The working copy is the local copy of files from a repository. All work done to the files in a repository is initially done on a working copy, hence the name.

Git commands cheat sheet