external diff how to configure

Hi,

I'm going to use my own customized diff tool.

I have already integrated my customized diff tool with Git bash. In my .gitconfig file, I have:

[diff]   external = <my diff>

And my customized diff tool can be used as normal git command from git bash:

git diff --cached $FILENAME

It works fine.

So with SourceTree, I go to Tools -> Options -> Diff, and in the External Diff section, I select "Custom" as External Diff Tool, and Diff Command as: git diff --cached, Arguments as: $LOCAL


But this doesn't work with the external diff button.

I can still call the cmd from Terminal and it works fine, but it won't work with the external diff button.

Can anyone help me on this?

Many thanks

1 answer

1 accepted

This widget could not be displayed.

You need to configure <my diff> as the external diff tool, not git diff --cached.

 

Suggest an answer

Log in or Sign up to answer
Atlassian Summit 2018

Meet the community IRL

Atlassian Summit is an excellent opportunity for in-person support, training, and networking.

Learn more
Community showcase
Published May 30, 2018 in Sourcetree

Tip from the team: configuring Git or Mercurial in Sourcetree

Supported Platforms macOS Windows To make using Sourcetree as simple yet powerful as possible we embed (bundle) dependencies such as Git, Git LFS, and Mercurial. We strive to keep these...

729 views 1 3
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you