From owner-freebsd-git@freebsd.org Sat May 1 20:12:12 2021 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E153B636B36 for ; Sat, 1 May 2021 20:12:12 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4FXgPm5wTkz4rvV for ; Sat, 1 May 2021 20:12:12 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: by mailman.nyi.freebsd.org (Postfix) id CB39A6369E4; Sat, 1 May 2021 20:12:12 +0000 (UTC) Delivered-To: git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CB039636872 for ; Sat, 1 May 2021 20:12:12 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FXgPm5Nz9z4rdF; Sat, 1 May 2021 20:12:12 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from tensor.andric.com (tensor.andric.com [IPv6:2001:470:7a58:1::1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "tensor.andric.com", Issuer "R3" (verified OK)) (Authenticated sender: dim) by smtp.freebsd.org (Postfix) with ESMTPSA id 968884826; Sat, 1 May 2021 20:12:12 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtpclient.apple (unknown [IPv6:2001:470:7a58:0:e0d3:13d5:7e22:8d]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 3259C59CE3; Sat, 1 May 2021 22:12:11 +0200 (CEST) From: Dimitry Andric Message-Id: <1772D08D-CE66-4285-B8EE-2A353E7B91E2@FreeBSD.org> Content-Type: multipart/signed; boundary="Apple-Mail=_B8F341A9-9E50-4189-AB7A-4A8BE175CEE8"; protocol="application/pgp-signature"; micalg=pgp-sha1 Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.80.0.2.43\)) Subject: Re: Ports tree have been migrated to git Date: Sat, 1 May 2021 22:12:04 +0200 In-Reply-To: Cc: Warner Losh , git@freebsd.org To: Kurt Jaeger References: X-Mailer: Apple Mail (2.3654.80.0.2.43) X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 May 2021 20:12:12 -0000 --Apple-Mail=_B8F341A9-9E50-4189-AB7A-4A8BE175CEE8 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii On 1 May 2021, at 22:08, Kurt Jaeger wrote: ... > I just want to be back in the state where git show does not show > any changes 8-} git checkout origin/main git branch -d main (you might have to use -D here if it doesn't want to = get rid of the branch) git checkout main And voila. -Dimitry --Apple-Mail=_B8F341A9-9E50-4189-AB7A-4A8BE175CEE8 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.2 iF0EARECAB0WIQR6tGLSzjX8bUI5T82wXqMKLiCWowUCYI22FAAKCRCwXqMKLiCW o0LgAJ43ZFQ47dyE6uDNIaUjb96WZul/gACg3TBO8oGfrjNwreCpFpYTI8Ge2ho= =d75o -----END PGP SIGNATURE----- --Apple-Mail=_B8F341A9-9E50-4189-AB7A-4A8BE175CEE8--