Git Settings

Git Difftool with Beyond Compare 3

git config --global diff.tool bc

git config --global difftool.bc.path "C:\Program Files (x86)\Beyond Compare 3\BComp.exe"

git config --global difftool.prompt false

git config --global merge.tool bc

git config --global mergetool.bc.path "C:\Program Files (x86)\Beyond Compare 3\BComp.exe"

git config --global alias.mydiff "difftool --dir-diff --tool=bc --no-prompt"

Git Difftool with Beyond Compare 3 - Linux

git config --global diff.tool bc

git config --global difftool.bc.path '/mnt/c/Program Files (x86)/Beyond Compare 3/BComp.exe'

git config --global difftool.prompt false

git config --global merge.tool bc

git config --global mergetool.bc.path '/mnt/c/Program Files (x86)/Beyond Compare 3/BComp.exe'

git config --global alias.mydiff "difftool --dir-diff --tool=bc --no-prompt"

Git Difftool with Beyond Compare 3 - WSL2

nano ~/.gitconfig

[difftool "bc"]
        cmd = '/mnt/c/Program Files (x86)/Beyond Compare 3/BComp.exe'   \"$(wslpath -aw $LOCAL)\" \"$(wslpath -aw $REMOTE)\"
        trustExitCode = true

Stack Overflow

Carriage return line feeds

Resolved: Git warning LF will be replaced by CRLF in file | vGeek - Tales from real IT system Administration environment (vcloud-lab.com)

Windows uses CRLF (\r\n) whereas Linux and MacOS just use line feed (\n).

You can turn off warnings with

git config core.autocrlf true