Git.CommonCommands.txt

--reset after .gitignore change

git rm -r --cached .
git add .
git commit -a -m "M"

--prune remote
git fetch -p

--branch delete safe (ensures changes branch b are already in the current branch)

git branch -d 

--branch force delete

git branch -D (force delete)

--pretty log

--add remote
git remote add origin "URI"
git log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative

--list merge conflicts
git ls-files -u | cut -f 2 | sort -u

--show origin tracking branches
git remote show origin

--
git branch --set-upstream foo upstream/foo