Skip to content

Instantly share code, notes, and snippets.

What would you like to do?
set git difftool to bbdiff
git config --global diff.tool bbdiff
git config --global difftool.bbdiff.cmd 'bbdiff --wait --resume "$LOCAL" "$REMOTE"'
git config --global difftool.prompt false
git config --global merge.tool bbdiff
git config --global mergetool.bbdiff.cmd 'bbdiff --wait --resume "$LOCAL" "$REMOTE"'
Double check ~/.gitconfig

This comment has been minimized.

Copy link

@racl101 racl101 commented Jan 2, 2019

Thanks for this. It was very helpful.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment