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

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

Git graph rebase terminology wrong?

So, I have a local branch "feature/feature1" that branches off "develop".

While I am working on the feature branch I make 3 commits. In the meantime, someone makes 18 commits on the develop branch.

As a responsible git user before merging my changes into "develop" I rebase "feature/feature1" onto develop.

Of course now "origin/feature/feature1" is not up to date with "feature/feature1" anymore. The top most entry in the git history graph is now "feature/feature1".
It is 18 commits ahead of "origin/feature/feature1" and 3 commits ahead of "origin/develop".

However, Sourcetree tells me that it is "18 commits ahead and 3 commits behind".
Should this not be "18 commits ahead and 3 commits ahead" instead?

Or am I understanding something wrong?

1 answer

0 votes
Mike Corsaro Atlassian Team Jul 10, 2018

Hello! This might be a bit hard to figure out without the picture of the graph itself, but that "3 commits behind" might be referring to the ancestor order rather than the date order. Could you post a picture of the graph? Thanks!

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...

5,692 views 4 12
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