Glossary

A

B

branch

A line of development that stems from another branch, typically main/master or sometimes dev.

C

checkout

Switching between working branches.

cherry-picking

Choosing a subset of changes from other commits, typically on different branches.

clone

Make a copy of a repository from a remote to your local computer.

commit

A single point in the Git history or the act of creating such a point in the history.

D

E

F

fast-forward

fetch

Get the head reference from a remote repository of a branch. It does not pull the changes.

fork

Make a copy of someone else’s repository to your GitHub account.

G

Git

Git is the version control system used in this course.

GitHub

GitHub is an on-line repository for hosting and sharing code for collaborative and often open-source work.

GitLab

GitLab is an on-line repository for hosting and sharing code for collaborative and often open-source work.

GitKraken

GitKraken is an intuitive GUI (Graphical User Interface) and powerful Git CLI (Command Line Interface).

H

hash

A “hash” is a unique ID generated and associated with each commit that allows it to be uniquely identified within a repository.

I

J

K

L

local

A copy of a repository on your computer.

M

main / master

The name given to the original code branch from which branches are made.

merge

Incorporate the contents of another branch into the current branch, typically this creates a new commit showing the changes that have occurred unless this is a fast-forward.

N

O

origin

The default upstream repository where files and code are stored for collaborative work. Typically this is hosted on GitHub/GitLab.

P

pull

Synchronising changes from branch on the remote origin with the local copy, it will fetch and merge.

push

Synchronising changes made to the branch on the local computer with those on the remote origin.

PyCharm

PyCharm is a popular Python IDE which includes Git and GitHub integration.

Q

R

rebase

Applies a changes from one branch to the current.

repository

RStudio

RStudio is a popular R IDE which includes Git and GitHub integration.

S

stage / staging

Choose which files to include in a commit.

T

U

upstream

The default branch that commits are merged into during a pull request.

V

VSCode

VSCode is a popular IDE with support for many languages and which includes Git and GitHub integration.

W

X

Y

yaml

yaml (Yaml Ain’t Markup Language) is a superset of JSON and is used for configuration files such as those that control GitHub Actions.

Z