From nobody Sun Aug 27 17:42:20 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 4RYgxg3B11z4rSW6 for ; Sun, 27 Aug 2023 17:42:31 +0000 (UTC) (envelope-from grahamperrin@gmail.com) Received: from mail-lf1-x12f.google.com (mail-lf1-x12f.google.com [IPv6:2a00:1450:4864:20::12f]) (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 4RYgxf4n76z4WB4 for ; Sun, 27 Aug 2023 17:42:30 +0000 (UTC) (envelope-from grahamperrin@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20221208 header.b=fcmfpUsw; spf=pass (mx1.freebsd.org: domain of grahamperrin@gmail.com designates 2a00:1450:4864:20::12f as permitted sender) smtp.mailfrom=grahamperrin@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-lf1-x12f.google.com with SMTP id 2adb3069b0e04-500aed06ffcso2227669e87.0 for ; Sun, 27 Aug 2023 10:42:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693158148; x=1693762948; h=content-transfer-encoding:in-reply-to:subject:from:references:to :content-language:user-agent:mime-version:date:message-id:from:to:cc :subject:date:message-id:reply-to; bh=lAeixk6vvrwdB56PemsBigsieDEYAq5xCiRszCk/6x4=; b=fcmfpUswRS3DODRqz7BgCjKyYNKAQQllD6S04HQ1/XbVi72VNUFQjV0KwwNY/2Kdsr XsVqA9ceIeeBoRhYU317LwHmSq9zt0CuOJewcPWF1bDxqI6AdSXD1aiAgaYb1lljzH/q 8vL5DZ3ZmpIDhwFeDPzaajpkDsZ8aZ4BqNRm1d2ayK9lBZoYlsiFXG+4673EtCDEnBuA vDO0ly8ZfWf8/ghA//Io9VgEMbKTJjL/EBQjrGsgmXZlh4f3cLAuhg3ZJOCC8rF1K6DR B8HwGVO4/Bd9yYHhRmKfnyboYl61b3ItNj2+7R0FzRuc40yxLov4lI6eyMzpyA0E7IUG YeLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693158148; x=1693762948; h=content-transfer-encoding:in-reply-to:subject:from:references:to :content-language:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=lAeixk6vvrwdB56PemsBigsieDEYAq5xCiRszCk/6x4=; b=iY0kTSKot2aprHGXjFlOZM0grqDNvpXK/dsM+52m9n+5Klv0y3/OBqsTZX+xqgEN1n DUISo7Yf7GxAoFWSGXaRyQn5m9eTSvQmmAQzSYG2Sz+fpNJYh1oZcP69TCMNtYfM9Laq scAPSQ1MQ47AFse5/0HTHVUAUTPLFwXjLr9ovaxWBRqV7cFZ6QXtPy6grgzmfmaMR1r5 pIg8PhFdETMGqfcOEvZ/SI0MUDSNcdSdaGByIieGmUMkvDmmeaG2uNuyx17dcbO/5vpo zlqVQNthOk6LDBfuAD4RVg9f9HNtpj9+1ZrwSA6TMd5KsldB2clir9utRpJsAyUdLHMO L6/g== X-Gm-Message-State: AOJu0YzKnIeRu96YSZO3ieuR4uisfpiDhzcIlVYW8qfDgwxnmsmRU54d Oq+9C1hxbfXWv+tFafPAJJC+irRfINE= X-Google-Smtp-Source: AGHT+IEcmM+YR9ci2xxDhT59ScU3LxKxREKfs9FF9NOz+gaPzl+fRY4pR7QYl9w/FC3OtIx6PJnj3A== X-Received: by 2002:a19:6d1c:0:b0:4fd:c83b:a093 with SMTP id i28-20020a196d1c000000b004fdc83ba093mr15372173lfc.1.1693158147735; Sun, 27 Aug 2023 10:42:27 -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 f15-20020a50ee8f000000b0051e2670d599sm3574354edr.4.2023.08.27.10.42.21 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 27 Aug 2023 10:42:23 -0700 (PDT) Message-ID: Date: Sun, 27 Aug 2023 18:42:20 +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 Content-Language: en-US To: questions@freebsd.org References: <20230827083631.192eb52f7b99e9ebd6b54ccf@sohara.org> From: Graham Perrin Subject: git-rebase(1) prior to a PR in in the github.com/freebsd area In-Reply-To: <20230827083631.192eb52f7b99e9ebd6b54ccf@sohara.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spamd-Result: default: False [-4.00 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.998]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36:c]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20221208]; MIME_GOOD(-0.10)[text/plain]; FROM_HAS_DN(0.00)[]; FREEFALL_USER(0.00)[grahamperrin]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; PREVIOUSLY_DELIVERED(0.00)[questions@freebsd.org]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::12f: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_NONE(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; MLMMJ_DEST(0.00)[questions@freebsd.org]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; FREEMAIL_ENVFROM(0.00)[gmail.com]; RCVD_COUNT_TWO(0.00)[2] X-Spamd-Bar: --- X-Rspamd-Queue-Id: 4RYgxf4n76z4WB4 On 27/08/2023 08:36, Steve O'Hara-Smith wrote: > On Sun, 27 Aug 2023 06:30:12 +0100 > Graham Perrin wrote: > >> I have a checkout of >> , and need to squash >> before I create a PR at , >> but I can't make sense of git-merge(1). >> >> >> >> Can anyone steer me? > IME git rebase is more useful that git merge. 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? Thanks