git-cheat-sheet.md

Git Cheat Sheet

Git Cheat Sheet © 2024 by Leanne Keeley & Sebastian Roman is licensed under Attribution-NonCommercial 4.0 International. To view a copy of this license, visit http://creativecommons.org/licenses/by-nc/4.0/

Last updated 2024-03-28

Warning

Please make sure Git is installed first!
Here is a guide on how to install Git

Git terms

Branch:
        A separate version of the code, used for testing new features

Develop (Branch):
        Usually the branch that you merge changes to

Fork:
        _noun A copy of a repository
        _verb To create a copy of a repository

Head:
        The most recent commit

Master (Branch):
        The main branch of your repository

Pull request:
        Ask the owner of a repository to merge your changes into the project

Remote/Origin/Upstream:
        These refer to the location of the repository online. This is where changes are pushed to (github, gitlab, etc.)

Repository/Repo:
        A container for your project

.gitignore:
       This is a file that contains the names of things you want git to ignore

Git Commands

Note

These comands are structured as git [command] [flags] [arguments]
Example: git checkout -b main
In this example, checkout is the command, -b is the flag, and main is the argument

add [file]:
        Adds the named file to your git repository

branch:
        Shows you the branch you are currently in

clone https://github.com/[username]/[repository].git:
        Copies a repository onto your local machine

checkout [branch or file]:
        Switch to a different branch, or pull the last committed version of a file

        -b flag allows you to create a new branch

commit:
        Adds a save point with new changes. Descriptive comments made it much easier to understand what change you saved

        -am '[comment]' flag allows you to add comment without going into a text editor

fetch:
        Download copies of all the files in a branch to your local machine

init:
        Creates a new git repository

log:
        Show you all the commits, merges, etc. to the current branch

merge [branch]:
        Combines the changes from the current branch into the named branch

pull:
        Same as fetch, but also merges those changes into the current branch

push:
        Send committed changes to the origin (ex. github)

rebase [branch]:
        Update the current branch to the status of the named branch

reset old-commit / revert head:
        Undoes commits, takes your project back to a previous state

stash:
        Stashes and removes uncommitted changes

stash pop:
        Reapply changes previously stashed

status:
        Shows you the current status of your repository. Use this often!