Date: Tue, 29 Dec 2020 19:38:27 +0200 From: Andriy Gapon <avg@FreeBSD.org> To: monochrome <monochrome@twcny.rr.com>, freebsd-current@freebsd.org Subject: Re: git and the loss of revision numbers Message-ID: <0adec2d2-acfb-9a3f-da69-aff7915ea67d@FreeBSD.org> In-Reply-To: <7bfab675-ddb4-bf53-d818-d35667c74522@twcny.rr.com> References: <54116640-E6A1-4C53-9D7E-4384F942628E@ellael.org> <8ABAC674-89AA-47BE-996C-4DF6E7713F21@ellael.org> <53dd689b-2401-8e90-f332-50c60c549c2e@FreeBSD.org> <CAPyFy2DW0YDUK%2Bkir2H_e8LVT-P-kQ0PMmKQO6m%2B016Wb=Hd0A@mail.gmail.com> <1d1e2003-0cc1-6e67-0ceb-f0fcba03f8f7@twcny.rr.com> <6a83684d-ee5b-5002-3553-7b383f02768c@nomadlogic.org> <e16ab2c2-d8fe-6b8c-56d4-789f0fa07041@FreeBSD.org> <7bfab675-ddb4-bf53-d818-d35667c74522@twcny.rr.com>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?0adec2d2-acfb-9a3f-da69-aff7915ea67d>