bkrauska

git config --global core.eol lf
git config --global core.autocrlf input

bkrauska

Install http://download-us.sourcegear.com/DiffMerge/4.2.0/DiffMerge_4.2.0.697.stable_x64.msi

// this is an adaptation of http://adventuresincoding.com/2010/04/how-to-setup-git-to-use-diffmerge

Then run the following commands from the git bash

git config --global merge.tool diffmerge

git config --global mergetool.diffmerge.cmd "sgdm --merge --result=\$MERGED \$LOCAL \$BASE \$REMOTE"

bkrauska

// find all files by name in current and sub-directories
find -name "file.name"

// find all files by name case insensitive in current and sub-directories
find -iname "file.name"

// find all files by name not matching in current and sub-directories
find -not -name "file.name"

// find files by size

bkrauska

// list local branches
git branch

// list remote branches
git branch -r

// list all branches
git branch -a

// create new branch