From nobody Thu Sep 07 20:18:35 2023 X-Original-To: freebsd-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 4RhVtn551mz4smhR for ; Thu, 7 Sep 2023 20:18:41 +0000 (UTC) (envelope-from grahamperrin@gmail.com) Received: from mail-ed1-x52e.google.com (mail-ed1-x52e.google.com [IPv6:2a00:1450:4864:20::52e]) (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 4RhVtm74Pdz4Vxk for ; Thu, 7 Sep 2023 20:18:40 +0000 (UTC) (envelope-from grahamperrin@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20221208 header.b=DxUG7mFF; spf=pass (mx1.freebsd.org: domain of grahamperrin@gmail.com designates 2a00:1450:4864:20::52e as permitted sender) smtp.mailfrom=grahamperrin@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-ed1-x52e.google.com with SMTP id 4fb4d7f45d1cf-52a1ce529fdso1888901a12.1 for ; Thu, 07 Sep 2023 13:18:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694117920; x=1694722720; darn=freebsd.org; h=content-transfer-encoding:in-reply-to:from:cc:references:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=VmEFYAWSlsNPjYw4r0rwMQfnmwwauuo0MVY5GieODZE=; b=DxUG7mFFK/RIG3YwHaBH1KrV2qThG0eTDwC0wp7BajoLaxHEZNib66M/GSX+7UKc11 zcWGpCuVZkSPvc6UJNigQYnB02A77HN9rHcAEGjF9ZhF26Eq8hK8dIzos3wwwnCZzS7y /gca4xwdb02qffPXSlJ0xlwKSg3cIaMSfEVnNX9NOFbF3uHz4asjYLM17d9r3ob9wFkh lnrujfPUk9Pb7GLrFEPfQSQfDAFq8PiUF+yLJjToVj6IvF9cvFifWl9oIHSgMjnG7/tX EfoLJZ+u2jQb2PqkDnzGg61fZDNF2wxowulqna+qSoapJnhzsSxNlHBXgDzrzyZn6Fox JsHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694117920; x=1694722720; h=content-transfer-encoding:in-reply-to:from:cc: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=VmEFYAWSlsNPjYw4r0rwMQfnmwwauuo0MVY5GieODZE=; b=KPSdCuGief43ZyW/RRQjGgTA587gFRBold2spOqJS8HuX8Ox4k1a/mCI9ZjKwcmUR0 44+GRBeH0WV6xcfYS3DWsStPMek0abafr4gBL3rC+Wk9bOvwiyOb/s7sglLJEAdtPtq7 zt6nO6lgZsSfpY2DubJGAps+dDghTWh2lEzjBjJrdvqL4UH47XVYuSRGIyHj98ho5Un9 uSJisRHPk3espa59pvK586D7KUDnOsPKe5yqhukUVXbY2mKbTPY8dDc9pKIln/toq5kr xJ+EOhmx+5aERmkRX0M8lEGjhStcmXzTopQ6FS8vESQwGRzHN8gl08feXNPzcKYC7+rG nCkA== X-Gm-Message-State: AOJu0YwhZV+f3Jyq/6ltkAPSlOMNb7SKrdqG9EmQJFliGfdZKTwAkMg1 LbUdlNkyvKZg/MgDVMcBlqg0Cs84fa8= X-Google-Smtp-Source: AGHT+IFfb6UpOvcLDykHkc+3/D7766+cc5nCsIVJnOivPnXoqTIedp8wmZ36mbA3fYfkU52MzuzjKg== X-Received: by 2002:a05:6402:1a43:b0:52c:4ddb:6ecf with SMTP id bf3-20020a0564021a4300b0052c4ddb6ecfmr292586edb.37.1694117919409; Thu, 07 Sep 2023 13:18:39 -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 e1-20020a056402148100b0052567e6586bsm190979edv.38.2023.09.07.13.18.37 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 07 Sep 2023 13:18:38 -0700 (PDT) Message-ID: Date: Thu, 7 Sep 2023 21:18:35 +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.15.0 Subject: Re: git-rebase(1) prior to a PR in in the github.com/freebsd area Content-Language: en-US To: Steve O'Hara-Smith References: <20230827083631.192eb52f7b99e9ebd6b54ccf@sohara.org> <20230827191324.eb8e546fdfb61469dd14bc5a@sohara.org> <55dc4697-dafe-19fe-0017-20a6effbac2b@gmail.com> <20230827213415.27b35f49feaf6b6959f9df7c@sohara.org> Cc: FreeBSD questions From: Graham Perrin In-Reply-To: <20230827213415.27b35f49feaf6b6959f9df7c@sohara.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spamd-Bar: --- X-Spamd-Result: default: False [-4.00 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.999]; 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:c]; MIME_GOOD(-0.10)[text/plain]; FREEFALL_USER(0.00)[grahamperrin]; FROM_HAS_DN(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[freebsd-questions@freebsd.org]; MLMMJ_DEST(0.00)[freebsd-questions@freebsd.org]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::52e:from]; ARC_NA(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; MID_RHS_MATCH_FROM(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; TO_DN_ALL(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; RCVD_COUNT_TWO(0.00)[2]; RCPT_COUNT_TWO(0.00)[2]; MIME_TRACE(0.00)[0:+]; FROM_EQ_ENVFROM(0.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; FREEMAIL_ENVFROM(0.00)[gmail.com]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Queue-Id: 4RhVtm74Pdz4Vxk On 27/08/2023 21:34, Steve O'Hara-Smith wrote: > 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~ Success. Thanks, Steve. Result: % git -C /usr/src log -n 1 commit 9de94bcad3dab199829e2755e816a1b30e23054c (HEAD -> bhyve, origin/bhyve) Author: Graham Perrin Date:   Sat Aug 19 08:41:09 2023 +0100     lowercase b for bhyve in five files     MFC after:      3 days     Pull-request: https://github.com/grahamperrin/freebsd-src/pull/3     Closes: https://github.com/grahamperrin/freebsd-src/pull/3     Pull-request: https://github.com/freebsd/freebsd-src/pull/838     Closes: https://github.com/freebsd/freebsd-src/pull/838     Signed-off-by:  Graham Perrin %