git and the loss of revision numbers

[Andriy Gapon]

On 2020-12-29 17:11, monochrome wrote:
> ok, this appears to be what I was looking for
> 
> example:
> git reset --hard f20c0e331
> then:
> git pull --ff-only
> is again able to update as normal
> 
> I should point out also that this is from the point of view of any
> random person just building freebsd from source, not a developer, so
> there are no local changes. Though it does blow away changes to the conf
> file, that's a lesser issue to deal with.

git stash [save] and git stash pop can be used to try[*] to preserve
minor local changes.

[*] there can be merge conflicts after stash pop if the same file(s) are
changed upstream as well.

-- 
Andriy