Skip to content

Instantly share code, notes, and snippets.

@wholmgren

wholmgren/use-bbdiff

Last active February 26, 2024 02:02
Show Gist options
  • Star 16 You must be signed in to star a gist
  • Fork 4 You must be signed in to fork a gist
  • Save wholmgren/64bd6e2f75de038296d4 to your computer and use it in GitHub Desktop.
Save wholmgren/64bd6e2f75de038296d4 to your computer and use it in GitHub Desktop.
Download ZIP
set git difftool to bbdiff
Raw
use-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
@racl101
Copy link

racl101 commented Jan 2, 2019

Thanks for this. It was very helpful.

@ThuanNP
Copy link

ThuanNP commented Feb 26, 2024

Thank's for your helpful codes.

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