Git Cheat Sheet

git switch -c feature/order-export       # new branch
git switch main                          # switch
git branch -vv                           # branches with upstream
git push -u origin feature/order-export  # publish + track
git branch -d feature/order-export       # delete local
git push origin :feature/order-export    # delete remote

git switch main
git pull --rebase
git merge --no-ff feature/order-export   # preserve merge commit
git merge --squash feature/order-export  # single commit on main

# Pull with rebase — keep history linear
git config --global pull.rebase true

# Interactive rebase: clean up the last 5 commits
git rebase -i HEAD~5
# pick / reword / squash / fixup / drop

# Rebase a feature branch on the latest main
git switch feature/order-export
git fetch origin
git rebase origin/main

git cherry-pick <sha>          # apply commit on current branch
git cherry-pick A^..B          # range, exclusive of A
git cherry-pick --continue     # after resolving conflicts

git stash push -m "wip: order export"
git stash list
git stash show -p stash@{0}
git stash pop                 # apply + remove
git stash apply stash@{1}     # apply, keep

git reset --soft HEAD~1     # uncommit, keep changes staged
git reset --mixed HEAD~1    # uncommit, keep changes unstaged
git reset --hard HEAD~1     # uncommit + discard changes (danger)

git restore --staged file   # unstage
git restore file            # discard local changes

git reflog                       # every HEAD movement
git checkout <reflog-sha>        # jump to lost commit
git branch rescue <reflog-sha>   # save it

# Recover a deleted branch
git reflog show --no-abbrev | grep <branch>
git branch <branch> <sha>

# Undo a force-push (if you have the old sha)
git update-ref refs/heads/main <old-sha>