From nobody Wed Sep 27 20:12:53 2023 X-Original-To: freebsd-questions@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RwnqF23DYz4twFh for ; Wed, 27 Sep 2023 20:13:13 +0000 (UTC) (envelope-from freebsd@gushi.org) Received: from prime.gushi.org (prime.gushi.org [IPv6:2620:137:6000:10::142]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "prime.gushi.org", Issuer "RapidSSL Global TLS RSA4096 SHA256 2022 CA1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RwnqD5l57z4KtT for ; Wed, 27 Sep 2023 20:13:12 +0000 (UTC) (envelope-from freebsd@gushi.org) Authentication-Results: mx1.freebsd.org; none Received: from smtpclient.apple (vpn-us.f.root-servers.org [149.20.8.9]) (authenticated bits=0) by prime.gushi.org (8.17.2/8.17.2) with ESMTPSA id 38RKD5CG058276 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 27 Sep 2023 20:13:06 GMT (envelope-from freebsd@gushi.org) DKIM-Filter: OpenDKIM Filter v2.10.3 prime.gushi.org 38RKD5CG058276 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gushi.org; s=prime2014; t=1695845586; bh=LuweBkaA/RCcy+/v/ACrCdQO60msKqutF6bF4IG+iTQ=; h=From:Subject:Date:In-Reply-To:Cc:To:References; z=From:=20"Dan=20Mahoney=20(Ports)"=20|Subject:= 20Re:=20resync=20ports?|Date:=20Wed,=2027=20Sep=202023=2013:12:53= 20-0700|In-Reply-To:=20|Cc:=20Freebsd-questions@freebsd.org|To:=20listac@nebe lschwaden.de|References:=20; b=X6be2BG2ki+lqD94pJbyjukrTpCTur4dt2mxKKZkumSk183gYz5nOi2I0/QhVHmO0 LDgdo+qcRV+Aj8THIizzdD/yYiw/vKJiWDEBUEX3+q1xkSaS6oRU8vQHmIyyn0/KTR oEjWzx4oYVgg71fmunoRRjGJwmSDhGkkYFUaOMJALxlNcrSD5odWU8+s6rGKzLujtI uoExX11EHJV1hdG8pYQLpZHHLiksU3ScgwuoIh1LOmotCVAi4Cn6gkEtqAmUbTBEx3 nFinowWkd8diFqNjCqtOVj1ZajPQgqOZsZKf8Kj4II1qlPxlfMOdlLoh+j7Uj+P1bc o7bLUo5HOFA+A== X-Authentication-Warning: prime.gushi.org: Host vpn-us.f.root-servers.org [149.20.8.9] claimed to be smtpclient.apple From: "Dan Mahoney (Ports)" Message-Id: <6C137DA9-2BF8-49EC-8086-CCDB3A3E64A7@gushi.org> Content-Type: multipart/alternative; boundary="Apple-Mail=_38CB3509-D858-4442-82CE-957C4DE83A33" List-Id: User questions List-Archive: https://lists.freebsd.org/archives/freebsd-questions List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-questions@freebsd.org X-BeenThere: freebsd-questions@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.700.6\)) Subject: Re: resync ports? Date: Wed, 27 Sep 2023 13:12:53 -0700 In-Reply-To: Cc: Freebsd-questions@freebsd.org To: listac@nebelschwaden.de References: X-Mailer: Apple Mail (2.3731.700.6) X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.6.4 (prime.gushi.org [149.20.68.142]); Wed, 27 Sep 2023 20:13:06 +0000 (UTC) X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:393507, ipnet:2620:137:6000::/44, country:US] X-Rspamd-Queue-Id: 4RwnqD5l57z4KtT --Apple-Mail=_38CB3509-D858-4442-82CE-957C4DE83A33 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 You=E2=80=99re looking for git reset =E2=80=94hard https://git-scm.com/docs/git-reset=EF=BF=BC -Dan > On Sep 27, 2023, at 12:41 PM, Ede Wolf = wrote: >=20 > Hello, >=20 > I had to make a change to a makefile to make that port compile. Now I = am wondering how to get the original makefile back, in a way that it is = controlled by git again? >=20 > Somehow I expected git pull to work like rsync, but it is obviously = not. >=20 > The question that emerges, is there a more resourcefriendly way to get = my portstree back in sync with git without a new full checkout? >=20 > Thanks >=20 > Ede --Apple-Mail=_38CB3509-D858-4442-82CE-957C4DE83A33 Content-Type: multipart/related; type="text/html"; boundary="Apple-Mail=_41A21094-28E1-4CF8-AD0D-2F63481C4914" --Apple-Mail=_41A21094-28E1-4CF8-AD0D-2F63481C4914 Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset=utf-8 You=E2=80=99re = looking for git reset = =E2=80=94hard