Git CheatSheet

git.txt

"git checkout ." - delete local changes
"git config --global credential.helper wincred" - save credentials
git checkout --ours .
git checkout --theirs .

To remove untracked files / directories do:
git clean -fdx
-f - force
-d - directories too
-x - remove ignored files too ( don't use this if you don't want to remove ignored files)

git tag -a v1.4 -m "my version 1.4"
git push origin v1.5

git diff tag1 tag2
git log tag1..tag2
git diff tag1 tag2 --stat