Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

Next challenges

Recent achievements

  • Global
  • Personal

Recognition

  • Give kudos
  • Received
  • Given

Leaderboard

  • Global

Trophy case

Kudos (beta program)

Kudos logo

You've been invited into the Kudos (beta program) private group. Chat with others in the program, or give feedback to Atlassian.

View group

It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

Does sourcetree support doing an external diff at the folder level (git difftool --dir-diff)

Is there way to get sourcetree to launch a folder-level external diff between commits? Essentially a "git difftool --dir-diff"?

Thanks,

dave

2 answers

Are there any updates about this topic? Isn't it still possible to do this using Source Tree?

You can multi-select files or use the tree view in the File Status tab and use external diff on that, it will essentially open for all files.

Instead of having of unassociated file pairs pushed one at a time to a file diff tool, I'm looking for two folder trees being created and pushed to a folder-level diff tool. So I can see both the hierarchy and also do more top-down diffing. That is what the new dir-diff does (info below).

For SourceTree I am looking for the ability to select two commits and run git difftool ---dir-diff on their SHAs. And of course be able to run it with --cached as well.

Since the diff tab only supports file arguments I can't update it there. But now that I think about it, perhaps I can get it working using Custom Actions. I just noticed in that pane that $SHA actually is for commit(s). Hmmm.

http://git-scm.com/docs/git-difftool.html

http://article.gmane.org/gmane.linux.kernel/1307164
"git difftool learned the "--dir-diff" option to spawn external diff tools that can compare two directory hierarchies at a time after populating two temporary directories, instead of running an instance of the external tool once per a file pair."

I would also love to see this happen. Now that Beyond Compare 4 is available on the Mac, it looks silly when it's not able to compare at the folder level. http://www.scootersoftware.com/images/FolderCompare.png http://www.scootersoftware.com/images/TextCompare.png

Like jkent-paylease likes this

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published in DevOps

Step up your DevOps game webinar Q&A series - Questions answered!

  On October 21st, 2020 we hosted a webinar titled,   Step Up You DevOps Game with 4 Key Integrations for Jira and Bitbucket. We had a great showing and high engagement, but that meant th...

117 views 0 1
Read article

Community Events

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

Find an event

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

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you