From nobody Sun Aug 27 19:50:56 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 4RYknx4Sj1z4rZSR for ; Sun, 27 Aug 2023 19:51:01 +0000 (UTC) (envelope-from grahamperrin@gmail.com) Received: from mail-ed1-x533.google.com (mail-ed1-x533.google.com [IPv6:2a00:1450:4864:20::533]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RYknw6FFdz4ncl for ; Sun, 27 Aug 2023 19:51:00 +0000 (UTC) (envelope-from grahamperrin@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20221208 header.b=htTy2Kdw; spf=pass (mx1.freebsd.org: domain of grahamperrin@gmail.com designates 2a00:1450:4864:20::533 as permitted sender) smtp.mailfrom=grahamperrin@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-ed1-x533.google.com with SMTP id 4fb4d7f45d1cf-529fb04a234so3522478a12.3 for ; Sun, 27 Aug 2023 12:51:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693165859; x=1693770659; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=kA64LLm6m3pzMxLbIBTpvNDQx0AhWQ3DyABCNkbgEH8=; b=htTy2KdwSY8WhygiPQEgSrskGcE9K+7ehodL1BTtIIBH/5FpiS07W8Scdh1Ng9K3Ph flUDza97zWUlMe/06gwkKxzpNRqOQc73yt4F6fXQMr+uXt6cdlzShaanpqCDBZ1Nd91S D3PtgXFJMExpoUvs1skmJXes3TpdvY0kc0YmPXFodzsgQbT2d+Z4Ip5UVBPBHTfJI5l/ 7dTOw3dDx0BU7C6hlFjyDPHr7pTjwtM25bRgCDyybIoiFR/RarPelxwLDNXvztUV/L56 42o3avRRLAcLJoqMwPbxWzXXXLxguZe5HWuQ7Dlz02Nn0r1fHAf1CE28kpG2Car/cI+q NP6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693165859; x=1693770659; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=kA64LLm6m3pzMxLbIBTpvNDQx0AhWQ3DyABCNkbgEH8=; b=PAyDO5uZuYf9aMFOcqfJaJTsFCko5brmXl3vXb7zQs9gfC4LpOJgtPs0CVUG+g6WsC YOZ3E2S4dWpoPyq4W1NxL6MCkugkxf3N4Gz37hRhhho3zEUTwmna//oPTBVnTeQIHADD gHsQRZEQrqhia+TT9P5lxS0hcqjNj7WsQEUfoelU9LIcUJFB6C4oiPorCUtviNxtX/Xa dEC5J3sA1xz0hU5cpKlu46Ptn0v0OTBcLRwtmQMknIsrOaZzLoxCCFDMdKZMt8TghFV8 g0Mq8Uir4eam1/BF0fvYzJBrN5hU0IHsrrhXG4YCGNYlgF6Kt9FnIudiONWL7b3NnvEU nolA== X-Gm-Message-State: AOJu0YycPVYSZvKe4wsCaPvv0r6ZcIdq7AZynS2dHL0E0SE/XBpHiAp4 pRn8xIOqiFUb3L66y2hVQxwnpT6+VsU= X-Google-Smtp-Source: AGHT+IHTGolhiLGsrqObnk1+Nc2mqqldxVxMVRUlryGHDCpr+11iudbJZ94YI4frQL8j3sW0J4vAng== X-Received: by 2002:aa7:dad5:0:b0:522:564d:6de with SMTP id x21-20020aa7dad5000000b00522564d06demr21247507eds.36.1693165858578; Sun, 27 Aug 2023 12:50:58 -0700 (PDT) Received: from [192.168.1.10] (80-42-66-93.dynamic.dsl.as9105.com. [80.42.66.93]) by smtp.gmail.com with ESMTPSA id s17-20020a056402165100b0052328d4268asm3655920edx.81.2023.08.27.12.50.57 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 27 Aug 2023 12:50:57 -0700 (PDT) Message-ID: <55dc4697-dafe-19fe-0017-20a6effbac2b@gmail.com> Date: Sun, 27 Aug 2023 20:50:56 +0100 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 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.14.0 Subject: Re: git-rebase(1) prior to a PR in in the github.com/freebsd area Content-Language: en-US To: questions@freebsd.org References: <20230827083631.192eb52f7b99e9ebd6b54ccf@sohara.org> <20230827191324.eb8e546fdfb61469dd14bc5a@sohara.org> From: Graham Perrin In-Reply-To: <20230827191324.eb8e546fdfb61469dd14bc5a@sohara.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spamd-Result: default: False [-2.95 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20221208]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36]; MIME_GOOD(-0.10)[text/plain]; NEURAL_SPAM_SHORT(0.05)[0.046]; FREEFALL_USER(0.00)[grahamperrin]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[questions@freebsd.org]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::533:from]; RCPT_COUNT_ONE(0.00)[1]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; DKIM_TRACE(0.00)[gmail.com:+]; FROM_EQ_ENVFROM(0.00)[]; TO_DN_NONE(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; MLMMJ_DEST(0.00)[questions@freebsd.org]; RCVD_TLS_LAST(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; MIME_TRACE(0.00)[0:+]; MID_RHS_MATCH_FROM(0.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; RCVD_COUNT_TWO(0.00)[2] X-Spamd-Bar: -- X-Rspamd-Queue-Id: 4RYknw6FFdz4ncl On 27/08/2023 19:13, Steve O'Hara-Smith wrote: > On Sun, 27 Aug 2023 18:42:20 +0100 > Graham Perrin wrote: > >> I did use 'git rebase -i' with success four days ago, for a PR in >> someone else's repo (not a fork of a FreeBSD tree). Successful then, >> however I have used the command so rarely – like, only a handful of >> occasions over the past year or so – that my mind goes blank. Entirely >> blank, and using a search engine will make things far worse for me. >> >> What should I do first, for the PR above? > I would go with git rebase -i - it pretty much tells you what to do > if you know what you want - but in this case it boils down to changing the > pick in front of the commits to a sequence like > > edit > squash > squash > ... > > Then tidying up the commit message. 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. Right now I can't repeat the routine, to get more detail, because I'm using my local copy of the main branch to update the OS. I might take another look tomorrow. Thanks