Use bbdiff to view differences between branches

91 views
Skip to first unread message

Ted Stresen-Reuter

unread,
Apr 26, 2024, 3:30:00 PM4/26/24
to bbe...@googlegroups.com
Hi,

I've got the following in my .git/config file 

[diff]
tool = bbdiff
[difftool "bbdiff"]
cmd = bbdiff --wait --resume \"$LOCAL\" \"$REMOTE\"
[difftool]
prompt = false

but when I execute:

git difftool goodbranch buggybranch

each file is opened in a separate window. It used to be that bbdiff would open two folders in a unified window. Is that not possible with git difftool?

TIA

Ted

Marshall Clow

unread,
Apr 26, 2024, 3:51:09 PM4/26/24
to bbe...@googlegroups.com
What happens if you try `git difftool goodbranch..buggybranch` instead?

— Marshall


Ted Stresen-Reuter

unread,
Apr 27, 2024, 5:19:43 AM4/27/24
to bbe...@googlegroups.com
Exactly the same behavior, but I like your thinking!

Ted 

jj

unread,
Apr 28, 2024, 10:42:18 AM4/28/24
to BBEdit Talk
Using the -d flag seems to do what you expect.

git difftool -d goodbranch buggybranch

HTH

Jean Jourdain

Reply all
Reply to author
Forward
0 new messages