Date: Tue, 29 Dec 2020 10:11:04 -0500 From: monochrome <monochrome@twcny.rr.com> To: freebsd-current@freebsd.org Subject: Re: git and the loss of revision numbers Message-ID: <7bfab675-ddb4-bf53-d818-d35667c74522@twcny.rr.com> In-Reply-To: <e16ab2c2-d8fe-6b8c-56d4-789f0fa07041@FreeBSD.org> 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>
next in thread | previous in thread | raw e-mail | index | archive | help
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. thanks! On 12/29/20 9:37 AM, Andriy Gapon wrote: > On 2020-12-29 02:56, Pete Wright wrote: >> >> On 12/28/20 4:38 PM, monochrome wrote: >>> what would be the git command for reverting source to a previous >>> version using these numbers? for example, with svn and old numbers: >>> svnlite update -r367627 /usr/src >>> >> I will generally just checkout the short git hash like so in my local >> checkout: >> $ git checkout gb81783dc98e6 >> >> you can quickly get the hashes by running "git log" from your checkout. > > I think that git checkout <commit> is a wrong tool here. > I personally would use git reset --hard <commit>. > Note that that command would also revert any local uncommitted changes > as well! > > My view of the difference between the commands: > - checkout: stage[*] a change that would modify the current state of the > branch to the selected commit's state > - reset: change the current branch (its head) to point to the selected > commit > > [*] by stage I mean modify the working copy and the index. > That is, if after git checkout you would run git commit then you would > commit a change that reverts the current branch to the selected point. >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?7bfab675-ddb4-bf53-d818-d35667c74522>