/git

git

Configure mergetool

git config --global --add merge.tool kdiff3  
git config --global --add mergetool.kdiff3.path "C:/Program Files/KDiff3/kdiff3.exe"  
git config --global --add mergetool.kdiff3.trustExitCode false

git config --global --add diff.guitool kdiff3  
git config --global --add difftool.kdiff3.path "C:/Program Files/KDiff3/kdiff3.exe"  
git config --global --add difftool.kdiff3.trustExitCode false

Remember password for git

Ubuntu

git config --global credential.helper cache

Windows

git config --global credential.helper wincred

Revert local commit without lossing changes

git reset --soft HEAD~1

Delete local GIT branches that were deleted on remote repository

git fetch --all
git branch -vv | grep ': gone]'|  grep -v "\*" | awk '{ print $1; }' | xargs git branch -d

Note: You can use a capital “D” instead of “d” to force delete

Git checkout file from specific branch or commit

git checkout origin/master -- src\folder\file-name.js