From owner-freebsd-questions@freebsd.org Sat Dec 26 18:32:04 2020 Return-Path: Delivered-To: freebsd-questions@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 4222B4BFEC5 for ; Sat, 26 Dec 2020 18:32:04 +0000 (UTC) (envelope-from 4250.82.1d4c70001ad0b06.a998d273228a6a3d34fda84808bd90c4@email-od.com) Received: from s1-b0c6.socketlabs.email-od.com (s1-b0c6.socketlabs.email-od.com [142.0.176.198]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4D3C8L1pJTz4Yr4 for ; Sat, 26 Dec 2020 18:32:01 +0000 (UTC) (envelope-from 4250.82.1d4c70001ad0b06.a998d273228a6a3d34fda84808bd90c4@email-od.com) DKIM-Signature: v=1; a=rsa-sha256; d=email-od.com;i=@email-od.com;s=dkim; c=relaxed/relaxed; q=dns/txt; t=1609007522; x=1611599522; h=content-transfer-encoding:content-type:mime-version:references:in-reply-to:message-id:subject:cc:to:from:date:x-thread-info; bh=SHuC0rSXbysBuZFvzkW/BwkinVLry3SX0BYuFMTH4Ok=; b=vMHd3i5VJzN3vgBAboQyNcOjvYaJNOLzgOYvaFtv8W62QsgYYKfr16qlIt7bvtOG0d0rYLkOlngYwopAyIxL8LNLGQW2PB4YolzPP6F6fc4HEsnzbtAgWouro2SEwWEzaQpGcW8UrdNJLmHsDa2uYWSMFMlcIjCz504WP11hRT0= X-Thread-Info: NDI1MC45Mi4xZDRjNzAwMDFhZDBiMDYuZnJlZWJzZC1xdWVzdGlvbnM9ZnJlZWJzZC5vcmc= Received: from r4.h.in.socketlabs.com (s1-b40f.socketlabs.email-od.com [142.0.180.15]) by mxsg2.email-od.com with ESMTP(version=Tls12 cipher=Aes256 bits=256); Sat, 26 Dec 2020 13:31:55 -0500 Received: from smtp.lan.sohara.org (EMTPY [185.202.17.215]) by r4.h.in.socketlabs.com with ESMTP(version=Tls12 cipher=Aes256 bits=256); Sat, 26 Dec 2020 13:31:54 -0500 Received: from [192.168.63.1] (helo=steve.lan.sohara.org) by smtp.lan.sohara.org with smtp (Exim 4.94 (FreeBSD)) (envelope-from ) id 1ktEM1-000MgV-Uc; Sat, 26 Dec 2020 18:31:49 +0000 Date: Sat, 26 Dec 2020 18:31:49 +0000 From: Steve O'Hara-Smith To: Tim Daneliuk Cc: FreeBSD Mailing List Subject: Re: Where can I find the new git repository? Message-Id: <20201226183149.5499b18c326cfd1d4cd4232f@sohara.org> In-Reply-To: <8cce7a4e-1173-5dcb-4ccd-5c379c1a0f83@tundraware.com> References: <5fe5917a.1c69fb81.b9a27.9006SMTPIN_ADDED_MISSING@mx.google.com> <8b1fbcaa-2e09-d2e4-03eb-1bbffcada788@yuripv.dev> <20201226113259.84b4389effd0ee1f05433e62@sohara.org> <8cce7a4e-1173-5dcb-4ccd-5c379c1a0f83@tundraware.com> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.32; amd64-portbld-freebsd12.1) X-Clacks-Overhead: "GNU Terry Pratchett" Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4D3C8L1pJTz4Yr4 X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=pass header.d=email-od.com header.s=dkim header.b=vMHd3i5V; dmarc=none; spf=pass (mx1.freebsd.org: domain of 4250.82.1d4c70001ad0b06.a998d273228a6a3d34fda84808bd90c4@email-od.com designates 142.0.176.198 as permitted sender) smtp.mailfrom=4250.82.1d4c70001ad0b06.a998d273228a6a3d34fda84808bd90c4@email-od.com X-Spamd-Result: default: False [-1.64 / 15.00]; RWL_MAILSPIKE_GOOD(0.00)[142.0.176.198:from]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ip4:142.0.176.0/20]; RCVD_COUNT_THREE(0.00)[4]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[email-od.com:+]; RCPT_COUNT_TWO(0.00)[2]; NEURAL_HAM_SHORT(-0.94)[-0.943]; FORGED_SENDER(0.30)[steve@sohara.org,4250.82.1d4c70001ad0b06.a998d273228a6a3d34fda84808bd90c4@email-od.com]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+]; RBL_DBL_DONT_QUERY_IPS(0.00)[142.0.176.198:from]; SUBJECT_ENDS_QUESTION(1.00)[]; FROM_NEQ_ENVFROM(0.00)[steve@sohara.org,4250.82.1d4c70001ad0b06.a998d273228a6a3d34fda84808bd90c4@email-od.com]; ASN(0.00)[asn:7381, ipnet:142.0.176.0/22, country:US]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[email-od.com:s=dkim]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[sohara.org]; SPAMHAUS_ZRD(0.00)[142.0.176.198:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[142.0.176.198:from]; MAILMAN_DEST(0.00)[freebsd-questions] X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Dec 2020 18:32:04 -0000 On Sat, 26 Dec 2020 10:52:10 -0600 Tim Daneliuk wrote: > On 12/26/20 5:32 AM, Steve O'Hara-Smith wrote: > > To collect changes from upstream use git fetch to fetch them > > and integrate them into your local branch use git pull (which combines a > > fetch and merge into your local repository). > > As a general matter, I do this: > > git pull --rebase > > That way any local changes I have committed will get laid down on top > of the remote master code. Yep that's the best way if you have local changes to remote branches, I prefer to use separate branches for local changes using the local copy of the remote branch as the upstream of the working branches. -- Steve O'Hara-Smith