From nobody Sun Aug 27 20:34:15 2023 X-Original-To: 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 4RYlm04m1Pz4rcN0 for ; Sun, 27 Aug 2023 20:34:24 +0000 (UTC) (envelope-from 4250.82.1d5040001cd5c37.e5c099051dd81c970907da7262b1e8f5@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 4RYllz64rSz4tYB for ; Sun, 27 Aug 2023 20:34:23 +0000 (UTC) (envelope-from 4250.82.1d5040001cd5c37.e5c099051dd81c970907da7262b1e8f5@email-od.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=email-od.com header.s=dkim header.b=wooKjISC; spf=pass (mx1.freebsd.org: domain of 4250.82.1d5040001cd5c37.e5c099051dd81c970907da7262b1e8f5@email-od.com designates 142.0.176.198 as permitted sender) smtp.mailfrom=4250.82.1d5040001cd5c37.e5c099051dd81c970907da7262b1e8f5@email-od.com; dmarc=none DKIM-Signature: v=1; a=rsa-sha256; d=email-od.com;i=@email-od.com;s=dkim; c=relaxed/relaxed; q=dns/txt; t=1693168464; x=1695760464; h=content-transfer-encoding:content-type:mime-version:references:in-reply-to:message-id:subject:to:from:date:x-thread-info:subject:to:from:cc:reply-to; bh=CPDXqAfTYjsSWQMdRt9apMYWFSsfcpFR5gGdXODcm2M=; b=wooKjISC9iAPwzIOzhNbvAJg30KFu2TXtlVZ9/A0Cvnam+D/OcNPSPtHmZOD22hXxDFaaGWkZtoD0Jls0qMTcZhMU2DX2TRbBHMFVrviotRzrBNyrE45Mhvs7I1mC5kHSIcStknLN3ZVWrl2tUkmtAuzASqN+tPITN+QYvHQKVk= X-Thread-Info: NDI1MC4xMi4xZDUwNDAwMDFjZDVjMzcucXVlc3Rpb25zPWZyZWVic2Qub3Jn Received: from r2.us-west-2.aws.in.socketlabs.com (r2.us-west-2.aws.in.socketlabs.com [142.0.190.2]) by mxsg2.email-od.com with ESMTP(version=Tls12 cipher=Aes256 bits=256); Sun, 27 Aug 2023 16:34:20 -0400 Received: from smtp.lan.sohara.org (EMTPY [185.202.17.215]) by r2.us-west-2.aws.in.socketlabs.com with ESMTP(version=Tls12 cipher=Aes256 bits=256); Sun, 27 Aug 2023 16:34:18 -0400 Received: from [192.168.63.1] (helo=steve.lan.sohara.org) by smtp.lan.sohara.org with smtp (Exim 4.95 (FreeBSD)) (envelope-from ) id 1qaMSf-000Mfr-HM for questions@freebsd.org; Sun, 27 Aug 2023 21:34:16 +0100 Date: Sun, 27 Aug 2023 21:34:15 +0100 From: Steve O'Hara-Smith To: questions@freebsd.org Subject: Re: git-rebase(1) prior to a PR in in the github.com/freebsd area Message-Id: <20230827213415.27b35f49feaf6b6959f9df7c@sohara.org> In-Reply-To: <55dc4697-dafe-19fe-0017-20a6effbac2b@gmail.com> References: <20230827083631.192eb52f7b99e9ebd6b54ccf@sohara.org> <20230827191324.eb8e546fdfb61469dd14bc5a@sohara.org> <55dc4697-dafe-19fe-0017-20a6effbac2b@gmail.com> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.33; amd64-portbld-freebsd13.1) X-Clacks-Overhead: "GNU Terry Pratchett" 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 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spamd-Result: default: False [-2.70 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; MV_CASE(0.50)[]; FORGED_SENDER(0.30)[steve@sohara.org,4250.82.1d5040001cd5c37.e5c099051dd81c970907da7262b1e8f5@email-od.com]; R_SPF_ALLOW(-0.20)[+ip4:142.0.176.0/20]; R_DKIM_ALLOW(-0.20)[email-od.com:s=dkim]; MIME_GOOD(-0.10)[text/plain]; MLMMJ_DEST(0.00)[questions@freebsd.org]; RCVD_TLS_LAST(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[142.0.190.2:received]; MIME_TRACE(0.00)[0:+]; FROM_NEQ_ENVFROM(0.00)[steve@sohara.org,4250.82.1d5040001cd5c37.e5c099051dd81c970907da7262b1e8f5@email-od.com]; ASN(0.00)[asn:7381, ipnet:142.0.176.0/22, country:US]; ARC_NA(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; MID_RHS_MATCH_FROM(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; DKIM_TRACE(0.00)[email-od.com:+]; TO_DN_NONE(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; DMARC_NA(0.00)[sohara.org]; DWL_DNSWL_NONE(0.00)[email-od.com:dkim] X-Spamd-Bar: -- X-Rspamd-Queue-Id: 4RYllz64rSz4tYB On Sun, 27 Aug 2023 20:50:56 +0100 Graham Perrin wrote: > I did try 'git rebase -i' before my previous post, there was nothing to > pick (or drop), which is partly why my mind went blank. Ah try git rebase -i HEAD~ -- Steve O'Hara-Smith