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

SourceTree diff between two commits

I am a newbie using Git and SourceTree. I would like to understand how can I use SourceTree to view differences between two different commits. The two commits can be on the same branch or on different branches.

Also explanation of diff parent vs diff merge in the diff view.

2 answers

Here is a much better solution :

From the "Log / History" tab, select the two commits ( Ctrl + left click ) and will siply display the diff

 

Hope that helps

Legend, so simple

This approach works to display the differences, I would like to produce an annotated report, a document or file, in the end, itemizing the changes by file. It would also be nice to attribute the change by commit and by the author.

you are my angle

Diff vs parent: the diff with the previous commit in the same (HEAD) branch

Diff vs merged: the diff with the previous commit in the other (merged) branch

Where is the option in SourceTree? I hightlighted two separate commit and I don't see any option to do that. Thanks.

I have the same question!

1. From one commit, right-click the other commit and select Merge... 2. Untick "Commit merged changed immediately". 3. Compare using Diff vs parent and Diff vs merged. 4. When you are happy, right-click on "Working Copy", select Reset..., select Reset All, click Reset All

Diff vs parent and Diff vs merged are available after a Merge, when selecting a file and clicking the "settings-like" button which is right from the search bar on top right of the diff.

Diff vs parent and Diff vs merged are available after a Merge, when selecting a file and clicking the "settings-like" button which is right from the search bar on top right of the diff.

thanks a lot for your answer But I think it should be easier and less risky than this simply selecting the 2 commits right clicking and Diff or something!

Suggest an answer

Log in or Sign up to answer
Community showcase
Posted in Bitbucket

Share your software development horror stories!

Hey Community! I work on the Bitbucket product marketing team. With Halloween approaching, we wanted to discuss a topic tailor-made for October: development horror stories. Whether it was a lurk...

580 views 6 2
Join discussion

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