Re: emacs.git 'master' reset

[email protected] writes:

> Note that they get different hashes, because a commit's hash is
> chained with previous commit's hashes, so if one is missing (or
> otherwise changed) the whole history from then on gets different
> hashes.

I wondered why there were different hashes this time.

No git guru here, but: apart from that suprise just hitting F u (aka
`magit-pull-from-upstream' in Magit) was good enough here.  My head
commit is in the master branch, and my master is some commits ahead of
origin/master.  The rebasing onto the new origin/master happened
automatically.  So I expect that for most people where the situation is
similar the procedure should not be complicated...?


Michael.