Git cheatsheet

git_cheat_sheet.md

Git cheat sheet

• Setup
• Branching
• Committing
• Staging
• Pushing
• Rebasing
• Stash
• Misc

Setup

Starting project

git init

Branching

Creating branch

git checkout -b <branch_name>
git push origin <branch_name> // If pushing it also to remote

Rename local branch

git branch -m <oldname> <newname>

Committing

Commit staged changes

git commit -m “message”

Splitting a commit

git rebase -i HEAD~<position_in_the_log>
git reset HEAD^
Create commits as desired

Staging

Stage files

git add <file> // single file
git add -A // all unstaged files

Unstage file

git reset HEAD — <file>

Ignore changed files

git checkout .

Pushing

Push changes

git push --set-upstream origin <branch_name> // First time
git push // Remaining times
git push -f // If history changed

Rebasing

Rebase

git rebase <base_branch>

Interactive rebase

git rebase -i HEAD~<position_in_the_log>

Change base branch

git rebase --onto <new_base_branch> <old_base_branh> <target_branch>

1 - branches can be either names or hash values
2 - target branch only if target is not the current branch

Stash

Stash current work

git add -A 
git stash

Load from stash

git stash apply // If only entry
git stash apply stash@{<INDEX>} // If multiple entries

Misc

Check status

git status

Check diff of uncommited files

git diff

Fancy git log

git log --graph --pretty=oneline