Git Glossary

A file that tells Git which files/folders to ignore and stop tracking.

A parallel version of the repository. Used to work on new features separately. Useful for experimentation and testing, as a sandbox.

Not the GitHub cat, but a Git keyword, short for 'concatenate', useful to view the contents of a file that contains merge conflicts.

A local copy of a remote repository.

A saved snapshot of changes in the repository.

Occurs when Git can't automatically merge changes. Manual intervention is required.

Creates a personal copy of someone else's repository on GitHub.

Git icon for fork:

Checks the installed version of Git.

Add file(s) to the staging area for the next commit.

The dot (.) refers to all, so in this case, the command adds all changed files to staging.

Lists branches; can also create or delete by specifying the argument.

Creates and switches to a new branch.

Copies (or clones) an existing Git repository from GitHub to your machine.

Records a snapshot of staged changes with a message.

Sets user details like name and email.

Shows differences between files or commits.

Initializes a new Git repository in the current folder.

Displays the commit history.

Merges another branch into the current branch.

Fetches and merges changes from the remote repository to local.

Uploads committed changes to a remote (web-based) repository like GitHub.

Links a local repository to a remote GitHub repository.

Shows the current state of the working directory and staging area.

The current commit your working directory is based on.

Combining changes from different branches.

The default name Git gives to the remote repository.

Proposes changes from one branch to be merged into another, often used in collaboration.

A markdown file that introduces and explains a project. Often shown at the repository's homepage.

The online (web-based) version of a repository (like on GitHub).

A project folder tracked by Git, either local or hosted online (e.g. on GitHub).

A secure method to authenticate your device to GitHub without entering username and password each time.

The area where changes are listed before they are committed. The "holding area".