Re: Difference between pull --rebase and fetch+rebase

Santi Béjar-2 wrote:

Yes, it is. The code expects that you always branch your topic
branches from the upstream branch, so all the possible fork points are
in the reflog. Your flow was to create the topic from a local commit
and then push that commit.

Thanks, Santi! After thinking for a while about what you said, I think I
understand. That could definitely be what I did, although I can't remember
for sure.

Would it make sense to teach "git rebase" the same tricks as "git pull
--rebase"?


Santi Béjar-2 wrote:

By the way, when Git tries to apply these two commits it should detect
that they are already applied so it should do nothing, isn't it?

Almost - it fails, but the merge tool resolves it automatically.


Martin
-- 
View this message in context: http://n2.nabble.com/Difference-between-pull-rebase-and-fetch-rebase-tp4266164p4274470.html
Sent from the git mailing list archive at Nabble.com.