GIT GUIDE | GIT | ROKOJORI Labs

NEWS

COMMUNITY

STORE

TUTORIALS

GIT

LOGOUT

LOGOUT

GIT

GIT GUIDE

Most needed commands for git

Show instructions for:

FETCH: Update online history

GIT-GUI

📌 Remote ▸

Fetch from ▸

🖱️ Click: origin

CMD/TERMINAL

git

fetch

STATUS: What is going on?

GIT-GUI

🗔 Message Window ▸

🖱️ Click: Rescan

CMD/TERMINAL

git

status

ADD: Mark files for saving

GIT-GUI

🗔 Message Window ▸

🖱️ Click: Stage Changed

CMD/TERMINAL

git

add

COMMIT: Save snapshot

GIT-GUI

🗔 Message Window ▸

💬 Commit Message ▸

⌨️ Type:

{Snap Shot Name}

🗔 Message Window ▸

🖱️ Click: Commit

CMD/TERMINAL

git

commit

-m "{Snap Shot Name}"

PUSH: Upload/share local history

GIT-GUI

🗔 Message Window ▸

🖱️ Click: Push

🗔 Push Window ▸

🖱️ Select:

{BRANCHNAME}

▸

🖱️ Click: Push

CMD/TERMINAL

git

push

BRANCH: Create branch

GIT-GUI

📌 Branch ▸

🖱️ Click: Create...

🗔 Create Branch Window ▸

Branch Name ▸

Name ▸

⌨️ Type:

{BRANCHNAME}

🗔 Create Branch Window ▸

Starting Revision ▸

🖱️ Select:

Tracking Branch

▸

List of names ▸

🖱️ Select:

{REMOTE-BRANCH-BASE}

🗔 Create Branch Window ▸

Options ▸

Update existing branch ▸

🖱️ Select:

🖱️ Check: ✓

Fetch Tracking Branch

🖱️ Check: ✓

Checkout After Creation

CMD/TERMINAL

git

branch

{BRANCHNAME}

{OPTIONAL-BASE-BRANCH}

git

checkout

{BRANCHNAME}

CHECKOUT: Switch branch

GIT-GUI

📌 Branch ▸

🖱️ Click: Checkout...

🗔 Checkout Window ▸

🖱️ Select:

Local Branch/Tracking Branch

▸

🖱️ Select:

{BRANCHNAME}

▸

🖱️ Click: Checkout

CMD/TERMINAL

git

checkout

{BRANCHNAME}

PULL: Download and merge with local

GIT-GUI

📌 Remote ▸

Fetch from ▸

🖱️ Click: origin

📌 Branch ▸

🖱️ Click: Checkout...

🗔 Checkout Window ▸

🖱️ Select:

Tracking Branch

▸

🖱️ Select:

{BRANCHNAME}

▸

🖱️ Click: Checkout

CMD/TERMINAL

git

pull

MERGE: Merge branches

GIT-GUI

📌 Merge ▸

Local Merge... ▸

🗔 Merge Window ▸

🖱️ Select:

Tracking Branch

▸

🖱️ Select:

{BRANCHNAME}

▸

🖱️ Click: Merge

CMD/TERMINAL

git

merge

{BRANCHNAME}

MERGE: Check conflicts before merging

GIT-GUI

📌 Merge ▸

Local Merge... ▸

🗔 Merge Window ▸

🖱️ Select:

Tracking Branch

▸

🖱️ Select:

{BRANCHNAME}

▸

🖱️ Click: Visualize

CMD/TERMINAL

git

merge --no-commit --no-ff

{BRANCHNAME}

git

merge abort

DIFF: Show merge conflicts

GIT-GUI Conflicts can be viewed per file in the left list.

CMD/TERMINAL

git

diff

--name-only

--diff-filter=U

--relative

::/_graphics/labs/git-logo-wide.svg

Official documentation: git fetch

Always safe to use

Overview

CMD/TERMINAL EXAMPLE

git

fetch

WHAT IT DOES

Downloads and updates the project history with all it branches and snap shots from the server into a hidden directory. It does not change the files of the local active state

WHEN TO USE

Everytime before you want to download the current states of any branches or snapshots and also when you want to upload something. Makes also sense before using git status.

Official documentation: git fetch

Always safe to use

Overview

CMD/TERMINAL EXAMPLE

git

fetch

WHAT IT DOES

Downloads and updates the project history with all it branches and snap shots from the server into a hidden directory. It does not change the files of the local active state

WHEN TO USE

Everytime before you want to download the current states of any branches or snapshots and also when you want to upload something. Makes also sense before using git status.

::/_graphics/labs/git-logo-wide.svg

Official documentation: git status

Always safe to use

Overview

CMD/TERMINAL EXAMPLE

git

status

WHAT IT DOES

Gives the name about the current local branch and its snapshot and its relation to its online pendant: Are they different and is one more up to date?
It also list all files that changed (untracked) and the changed files that are picked to be included (staged) for the next snap shot (commit)

WHEN TO USE

Everytime you want to know something about the current branch, either to see which local changes exists to the snapshot it is based on or its relation to the online version.

Official documentation: git status

Always safe to use

Overview

CMD/TERMINAL EXAMPLE

git

status

WHAT IT DOES

WHEN TO USE

Everytime you want to know something about the current branch, either to see which local changes exists to the snapshot it is based on or its relation to the online version.

::/_graphics/labs/git-logo-wide.svg

Official documentation: git add

Caution: Use only before saving

Overview

CMD/TERMINAL EXAMPLE

git

add

git

add "{path/to/something}"

WHAT IT DOES

Depending on the current working directory of the CMD/terminal it will mark all changed files of the path and mark them - they are staged. These marked files will be included in the next snapshot (commit). Using only a dot takes all files from the current working directory.

WHEN TO USE

Before you want to save/create a snapshot (commit). You can see which files are marked as staged with git status.

Official documentation: git add

Caution: Use only before saving

Overview

CMD/TERMINAL EXAMPLE

git

add

git

add "{path/to/something}"

WHAT IT DOES

WHEN TO USE

Before you want to save/create a snapshot (commit). You can see which files are marked as staged with git status.

::/_graphics/labs/git-logo-wide.svg

Official documentation: git commit

Caution: Use to save a snapshot

Overview

CMD/TERMINAL EXAMPLE

git

commit

-m "{Snap Shot Name}"

WHAT IT DOES

Saves all marked files into a snapshot - a commit.

WHEN TO USE

If you want save to current state as logical unit.

Official documentation: git commit

Caution: Use to save a snapshot

Overview

CMD/TERMINAL EXAMPLE

git

commit

-m "{Snap Shot Name}"

WHAT IT DOES

Saves all marked files into a snapshot - a commit.

WHEN TO USE

If you want save to current state as logical unit.

::/_graphics/labs/git-logo-wide.svg

Official documentation: git push

Caution: Use only to upload

Overview

CMD/TERMINAL EXAMPLE

git

push

WHAT IT DOES

Uploads all snapshot (commits) to the server

WHEN TO USE

When you want to save your local snapshots online and want to share them with others.

Official documentation: git push

Caution: Use only to upload

Overview

CMD/TERMINAL EXAMPLE

git

push

WHAT IT DOES

Uploads all snapshot (commits) to the server

WHEN TO USE

When you want to save your local snapshots online and want to share them with others.

::/_graphics/labs/git-logo-wide.svg

Official documentation: git branch

Caution: Use only without pending changes

Overview

CMD/TERMINAL EXAMPLE

git

branch

{BRANCHNAME}

git

checkout

{BRANCHNAME}

WHAT IT DOES

This creates a new branch and switches to it with the second command.

WHEN TO USE

If you want to create a new branch. It could be for developing, testing things out or for saving stuff, that is not used in the other branches yet.

Official documentation: git branch

Caution: Use only without pending changes

Overview

CMD/TERMINAL EXAMPLE

git

branch

{BRANCHNAME}

git

checkout

{BRANCHNAME}

WHAT IT DOES

This creates a new branch and switches to it with the second command.

WHEN TO USE

If you want to create a new branch. It could be for developing, testing things out or for saving stuff, that is not used in the other branches yet.

::/_graphics/labs/git-logo-wide.svg

Official documentation: git checkout

Caution: Use only without pending changes

Overview

CMD/TERMINAL EXAMPLE

git

checkout

{BRANCHNAME}

WHAT IT DOES

Adds and remove files from the current state to match the most current state (commit) of the "checked out" branch.

WHEN TO USE

When you want to switch the history branch of the project - to see another version with different features or workstates of others.

Official documentation: git checkout

Caution: Use only without pending changes

Overview

CMD/TERMINAL EXAMPLE

git

checkout

{BRANCHNAME}

WHAT IT DOES

Adds and remove files from the current state to match the most current state (commit) of the "checked out" branch.

WHEN TO USE

When you want to switch the history branch of the project - to see another version with different features or workstates of others.

::/_graphics/labs/git-logo-wide.svg

Official documentation: git pull

Caution: Use only without pending changes

Overview

CMD/TERMINAL EXAMPLE

git

pull

WHAT IT DOES

Downloads the online history and add/remove files to match the recent online state (commit) of the current branch.

WHEN TO USE

When you want to update to the latest state of a branch.

Official documentation: git pull

Caution: Use only without pending changes

Overview

CMD/TERMINAL EXAMPLE

git

pull

WHAT IT DOES

Downloads the online history and add/remove files to match the recent online state (commit) of the current branch.

WHEN TO USE

When you want to update to the latest state of a branch.

::/_graphics/labs/git-logo-wide.svg

Official documentation: git merge

Caution: Use only without pending changes

Overview

CMD/TERMINAL EXAMPLE

git

merge

{BRANCHNAME}

WHAT IT DOES

It adds, changes, and removes files to combine the newest versions of the current branch and the merging branch. If there are files that have new seperate changes in both branches a merge conflict arises. Merge conflicts are sometimes resolved automatically, but should be double checked manually.

WHEN TO USE

When you want to combine two (or multiple) project states into one that contains all states.

Official documentation: git merge

Caution: Use only without pending changes