Date: Sat, 18 Jun 2022 23:06:31 +0200 From: Michael Gmelin <grembo@freebsd.org> To: Andy Farkas <andyf@andyit.com.au> Cc: freebsd-ports@freebsd.org, Mark Millard <marklmi@yahoo.com> Subject: Re: git pull not replicating? Message-ID: <A7D81851-7A53-4A4E-BC46-81366420EFF6@freebsd.org> In-Reply-To: <f6147fb6-a3db-3058-f374-4f7260ee9481@andyit.com.au> References: <f6147fb6-a3db-3058-f374-4f7260ee9481@andyit.com.au>
next in thread | previous in thread | raw e-mail | index | archive | help
--Apple-Mail-D8BD394B-2313-40D0-B622-55F298D6A05E Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable > On 18. Jun 2022, at 22:25, Andy Farkas <andyf@andyit.com.au> wrote: >=20 > =EF=BB=BF > Thank you Michael and Mark, you have increased my understanding of git > such that it now makes a bit more sense of what is going on. The many > many git manpages I find hard to comprehend. (what does <tree-ish> > supposed to mean?) See top answer here: https://stackoverflow.com/questions/4044368/what-does-t= ree-ish-mean-in-git > =E2=80=A6 > I'm a mere mortal user... although I was once listed in the now > non-existent FreeBSD 'Contributors' web page... > =E2=80=A6 The contributors page still exists and you=E2=80=99re still on it: https://docs.freebsd.org/en/articles/contributors/ Cheers Michael >=20 >> # git -C /usr/ports reset --hard HEAD >>=20 >> would destroy any deliberate changes to things >> in your /usr/ports tree. >=20 > Bingo! This is what I'm after. >=20 >> git is biased to on-going development and so expects >> to deal with differences being involved in the local >> directory tree. It is extra work to be sure no >> differences occur or to remove the differences when >> unintended ones show up. It is not automatic. >=20 > There ya go.. >=20 > Thanks again, >=20 > -andyf >=20 >=20 --Apple-Mail-D8BD394B-2313-40D0-B622-55F298D6A05E Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: quoted-printable <html><head><meta http-equiv=3D"content-type" content=3D"text/html; charset=3D= utf-8"></head><body dir=3D"auto"><div dir=3D"ltr"></div><div dir=3D"ltr"><br= ></div><div dir=3D"ltr"><br><blockquote type=3D"cite">On 18. Jun 2022, at 22= :25, Andy Farkas <andyf@andyit.com.au> wrote:<br><br></blockquote></di= v><blockquote type=3D"cite"><div dir=3D"ltr">=EF=BB=BF<span></span><br><span= >Thank you Michael and Mark, you have increased my understanding of git</spa= n><br><span>such that it now makes a bit more sense of what is going on. The= many</span><br><span>many git manpages I find hard to comprehend. (what doe= s <tree-ish></span><br><span>supposed to mean?)</span><br></div></bloc= kquote><div><br></div><div>See top answer here: <a href=3D"https://stac= koverflow.com/questions/4044368/what-does-tree-ish-mean-in-git">https://stac= koverflow.com/questions/4044368/what-does-tree-ish-mean-in-git</a></div><div= ><br></div><div><div dir=3D"ltr"><blockquote type=3D"cite">=E2=80=A6<br></bl= ockquote>I'm a mere mortal user... although I was once listed in the now</di= v><blockquote type=3D"cite"><div dir=3D"ltr">non-existent FreeBSD 'Contribut= ors' web page...</div></blockquote><blockquote type=3D"cite">=E2=80=A6</bloc= kquote></div><div><br></div><div>The contributors page still exists and you=E2= =80=99re still on it:</div><div><br></div><div><a href=3D"https://docs.freeb= sd.org/en/articles/contributors/">https://docs.freebsd.org/en/articles/contr= ibutors/</a></div><div><br></div><div>Cheers</div><div>Michael</div><div><br= ></div><br><blockquote type=3D"cite"><div dir=3D"ltr"><span></span><br># git= -C /usr/ports reset --hard HEAD<blockquote type=3D"cite"><span></span><br><= /blockquote><blockquote type=3D"cite"><span>would destroy any deliberate cha= nges to things</span><br></blockquote><blockquote type=3D"cite"><span>in you= r /usr/ports tree.</span><br></blockquote><span></span><br><span>Bingo! = ; This is what I'm after.</span><br><span></span><br><blockquote type=3D"cit= e"><span>git is biased to on-going development and so expects</span><br></bl= ockquote><blockquote type=3D"cite"><span>to deal with differences being invo= lved in the local</span><br></blockquote><blockquote type=3D"cite"><span>dir= ectory tree. It is extra work to be sure no</span><br></blockquote><blockquo= te type=3D"cite"><span>differences occur or to remove the differences when</= span><br></blockquote><blockquote type=3D"cite"><span>unintended ones show u= p. It is not automatic.</span><br></blockquote><span></span><br><span>There y= a go..</span><br><span></span><br><span>Thanks again,</span><br><span></span= ><br><span>-andyf</span><br><span></span><br><span></span><br></div></blockq= uote></body></html>= --Apple-Mail-D8BD394B-2313-40D0-B622-55F298D6A05E--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?A7D81851-7A53-4A4E-BC46-81366420EFF6>