From owner-freebsd-questions@freebsd.org Wed Apr 28 12:20:10 2021 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 862F85F145C for ; Wed, 28 Apr 2021 12:20:10 +0000 (UTC) (envelope-from 4250.82.1d4cf00052cb978.1e730130e650e2aa19e1f950394668e4@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 4FVd4T5bcxz4bYF for ; Wed, 28 Apr 2021 12:20:09 +0000 (UTC) (envelope-from 4250.82.1d4cf00052cb978.1e730130e650e2aa19e1f950394668e4@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=1619612410; x=1622204410; h=content-transfer-encoding:content-type:mime-version:references:in-reply-to:message-id:subject:to:from:date:x-thread-info; bh=OT91J4P+VCt+y59qyRcsLkQDAhtsUjg9nrH8bc22bOM=; b=t9iDrBkrXh5ORmN6/p17SaACU8dbO88QbP8FcO+pkPUP9wjfKDciAUWLirZYYXheY0JKPMj00TMCI8PYOd5DV2RmfFONJD8HAPK0fIIjr4ai7MITYA39xnE8S+4X7C1M4EVHexfwpCoeoS7iv4b80z4uJW1G5eWHT1OhHubzNjc= X-Thread-Info: NDI1MC4xMi4xZDRjZjAwMDUyY2I5NzguZnJlZWJzZC1xdWVzdGlvbnM9ZnJlZWJzZC5vcmc= Received: from r1.us-east-1.aws.in.socketlabs.com (r1.us-east-1.aws.in.socketlabs.com [142.0.191.1]) by mxsg2.email-od.com with ESMTP(version=Tls12 cipher=Aes256 bits=256); Wed, 28 Apr 2021 08:20:08 -0400 "MachineName": "AE-PR-REC01", "Ehlo": true, "HeloDomain": "smtp.lan.sohara.org", "Timestamp": "2021-04-28T08:20:08.1167616-04:00", "Auth": "CramMd5", "MessageNumber": 1, "RemoteIp": "185.202.17.215", "RemotePort": 0, "LocalIp": "10.16.4.123", "LocalPort": "2526", "MailFrom": { "Email": "steve@sohara.org", "Name": null, "Local": "steve", "Domain": "sohara.org" }, "TlsLogData": { "Enabled": true, "CertSubject": null, "CryptProtocol": 3072, "CryptCipherAlgId": 26128, "CryptHashAlgId": 32781, "CryptExchangeAlgId": 44550 } } Received: from smtp.lan.sohara.org (EMTPY [185.202.17.215]) by r1.us-east-1.aws.in.socketlabs.com with ESMTP(version=Tls12 cipher=Aes256 bits=256); Wed, 28 Apr 2021 08:20:07 -0400 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 1lbjAl-000KoU-BZ for freebsd-questions@freebsd.org; Wed, 28 Apr 2021 13:20:06 +0100 Date: Wed, 28 Apr 2021 13:20:06 +0100 From: Steve O'Hara-Smith To: freebsd-questions@freebsd.org Subject: Re: Maintaining my own branch with git Message-Id: <20210428132006.881d7ca8d85907ae177e1315@sohara.org> In-Reply-To: <20210428131629.b644748817de331dbe2edef6@sohara.org> References: <20210428131629.b644748817de331dbe2edef6@sohara.org> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.33; 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: 4FVd4T5bcxz4bYF X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=email-od.com header.s=dkim header.b=t9iDrBkr; dmarc=none; spf=pass (mx1.freebsd.org: domain of 4250.82.1d4cf00052cb978.1e730130e650e2aa19e1f950394668e4@email-od.com designates 142.0.176.198 as permitted sender) smtp.mailfrom=4250.82.1d4cf00052cb978.1e730130e650e2aa19e1f950394668e4@email-od.com X-Spamd-Result: default: False [-2.70 / 15.00]; ARC_NA(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[142.0.176.198:from]; R_DKIM_ALLOW(-0.20)[email-od.com:s=dkim]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:142.0.176.0/20:c]; MV_CASE(0.50)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; DMARC_NA(0.00)[sohara.org]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[142.0.176.198:from:127.0.2.255]; RCVD_COUNT_THREE(0.00)[4]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DKIM_TRACE(0.00)[email-od.com:+]; NEURAL_HAM_SHORT(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; FORGED_SENDER(0.30)[steve@sohara.org,4250.82.1d4cf00052cb978.1e730130e650e2aa19e1f950394668e4@email-od.com]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:7381, ipnet:142.0.176.0/22, country:US]; FROM_NEQ_ENVFROM(0.00)[steve@sohara.org,4250.82.1d4cf00052cb978.1e730130e650e2aa19e1f950394668e4@email-od.com]; 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: Wed, 28 Apr 2021 12:20:10 -0000 On Wed, 28 Apr 2021 13:16:29 +0100 "Steve O'Hara-Smith" wrote: > 5: Update main with git pull (while freebsd/main is checked out) UGH sorry (while main is checked out). -- Steve O'Hara-Smith