Official git cheat sheet
https://github.github.com/training-kit/downloads/github-git-cheat-sheet/
Pro Git book (for free 🙂)
https://git-scm.com/book/en/v2
Git configurtion files
https://git-scm.com/book/en/v2/Getting-Started-First-Time-Git-Setup
https://www.onwebsecurity.com/configuration/git-on-windows-location-of-global-configuration-file.html
$ git config --list [--show-origin]
Lists all git config variables and its location.
These variables can be stored in three different places. (local, system and global)
$ git merge --squash <<branch>>
Summarizes all commits from <<>> in a single commit
$ git config --global -e
Configures VS Code as default tool. Just copy below content on .gitconfig
[core]
editor = code --wait
[merge]
tool = vscode
[mergetool "vscode"]
cmd = code --wait $MERGED
[diff]
tool = vscode
[difftool "vscode"]
cmd = code --wait --diff $LOCAL $REMOTE
$ git mergetool
$ git difftool
Calls diff/merge tools