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

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
Posted in Sourcetree

[dev team] Sourcetree for Windows 2019 Preview - Dark Theme

Hi folks, While the full post is over on our blog I'd like to share the dark theme we've got planned for 2019 here directly as well to keep the discussion going.  The ...

3,280 views 19 18
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