-------CONFIG-----------
git config --list --show-origin
-------BRANCHES---------
git push -u origin {name}
git checkout --track origin/{branch}
git branch -d {name} ## delete local branch
git branch -r ## list remote branches
git branch -avv ## list branches detailed
git remote prune origin ## delete leftover local branches
MERGING Remote Master to Local
git fetch origin
git merge origin/master (git pull)
git rebase origin/master (git pull --rebase)
(error) git add {file} for each conflict; git rebase --continue
Fetch recent submodules
git submodule update --init --recursive
git stashing (with untracked files)
git stash -u
git pull origin master
git stash pop
updating one file from remote repo
git fetch
git checkout origin/master -- path/to/file
git checkout ## revert file to previous commit
git cherry-pick -x ## do in branch you want to merge pick
git cherry-pick -n 5ed3408a^..cbdf7ea2 ## merge range of commits, unstagged
- git reset --soft HEAD^
- git reset --hard HEAD^ Undo last commit and all changes $
- git status -v
- git log / git show
- git config --global alias.st status
- git diff --cached -- see uncommited changes