Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Deleted user
0 / 0 points
Next:
badges earned

Your Points Tracker
Challenges
Leaderboard
  • Global
  • Feed

Badge for your thoughts?

You're enrolled in our new beta rewards program. Join our group to get the inside scoop and share your feedback.

Join group
Recognition
Give the gift of kudos
You have 0 kudos available to give
Who do you want to recognize?
Why do you want to recognize them?
Kudos
Great job appreciating your peers!
Check back soon to give more kudos.

Past Kudos Given
No kudos given
You haven't given any kudos yet. Share the love above and you'll see it here.

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

Understanding diff against current ?

I have two branches in source tree - master and branch-1. The current branch is master (in bold text in source tree). I right click on branch-1 and do "diff against current". Does this mean "git diff master branch-1", OR "git diff branch-1 master" ?

I wanted to merge branch-1 into master. But, before merging I want to see the changes which branch-1 would introduce into master. Should I select master as current & then then diff against branch-1 or vice versa ?

As an aside, is there a way to see all the commands which source tree performs in the background ? Thanks.

1 answer

0 votes
Mikael Sandberg Community Leader Oct 18, 2019

The diff against current is the equivalent of git diff master...branch

@Mikael Sandberg- In your answer, you have assumed that master is the current branch, right ?

Mikael Sandberg Community Leader Oct 18, 2019

Sorry, should have added that. My example assumes branch is the current branch.

@Mikael Sandberg- Sorry your previous comment is not clear.
"My example assumes branch is the current branch." Which branch are you talking about after "assumes branch ???..."

The command git diff master...branch will show all changes made in branch that have not yet been merged into master, same as compare against current in Sourcetree assuming branch is your current branch.

Suggest an answer

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

Tip from the team: configure your repos for hosting goodness!

Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...

3,402 views 4 5
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