Forums

Articles
Create
cancel
Showing results for 
Search instead for 
Did you mean: 

Git graph rebase terminology wrong?

n_rammerstorfer
I'm New Here
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
July 7, 2018

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
Atlassian Team members are employees working across the company in a wide variety of roles.
July 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
AUG Leaders

Atlassian Community Events