From nobody Fri Sep 15 20:45:46 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 4RnR6V6f5dz4t1WX for ; Fri, 15 Sep 2023 20:45:54 +0000 (UTC) (envelope-from grahamperrin@gmail.com) Received: from mail-lf1-x12d.google.com (mail-lf1-x12d.google.com [IPv6:2a00:1450:4864:20::12d]) (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 4RnR6V4zfJz4LDd for ; Fri, 15 Sep 2023 20:45:54 +0000 (UTC) (envelope-from grahamperrin@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-lf1-x12d.google.com with SMTP id 2adb3069b0e04-502984f5018so4248352e87.3 for ; Fri, 15 Sep 2023 13:45:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1694810750; x=1695415550; darn=freebsd.org; h=content-transfer-encoding:in-reply-to:subject:from:content-language :references:cc:to:user-agent:mime-version:date:message-id:from:to:cc :subject:date:message-id:reply-to; bh=FZ2CN67EEqwC8s/g/2jC+8BDohHPvMvlaike3wYBaVM=; b=EsPONx66F5J7be/Fx4tukwAjftzrH4sL0mnQhpKb9lhm2OPs7zqHzUuK3Ck59AFf+l rx2m9gzbr6s7QmcyV67e/DwIv23ZBbthDzHuc4PZNch08pUkrKDN0p7ifemKvhMDPLVK N/YbHnSahjrEe/dE794ynoeqxf+hs0uN0lkQwc0gPtOf5lblDlOndL6Ve/UO8LW0n+HE XU6BhhHdDuFfVOKvsEPzM/ifoueGo1v8LpyzshDNfoVOfAiKPKGP/KT/nUGk7AdsjF7C /nmhyPiuhErUIcQaMWgOtHoxywjv5s2BBVTUSgaa9f55dODbbabRM8HLh9bH6Y/qeIso Qi/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694810750; x=1695415550; h=content-transfer-encoding:in-reply-to:subject:from:content-language :references:cc:to:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=FZ2CN67EEqwC8s/g/2jC+8BDohHPvMvlaike3wYBaVM=; b=qJbOB5PYhD3yQe8Tn5JSfbC6dj4DqFewH0Cc3eL9EhkJ1zUzbRLMJ08w+Qk5YM3Mx6 DWTOBDoZqSlwknNiUSRxIQuVXLh+h+kt4786tSUXzV4yaHL+x9ZryKa3W2nX+QYj8aOF CQKh5QWCtzMPRy/+MmPgeBSdm/MTclsxlB9+g8cYpXCC38iVCnG5bq8pW+OIE0Prraui wvhb0jXfV0NMKJRjqM9YdPn4reDqRFXW1l5a1AYoHXVA16aRYh40tbjeM8CJNKLHW4Rr KNQGr78XIdNxaFQAuSt5Tazi6rq+mfqSW4j4CGjqe2TznaH2SBKOgVlY5vErk+KlKL1H MFkQ== X-Gm-Message-State: AOJu0YxWbcQ0XGNcyXwn3zk7HY0/eIHYgWz8D6E1WWaxbDwdiXVpMNIT W1ork3T1QU22KIVfzmHAH238illhH+E= X-Google-Smtp-Source: AGHT+IFyknAxvuvORcvfYYfB27810L6OYH8Al76/AJBex/BokSfMXQqThR95h4isLk8N/8+Stn2ZzQ== X-Received: by 2002:a05:651c:149:b0:2bd:169e:3819 with SMTP id c9-20020a05651c014900b002bd169e3819mr2518998ljd.17.1694810749561; Fri, 15 Sep 2023 13:45:49 -0700 (PDT) Received: from [192.168.1.6] (80-42-66-93.dynamic.dsl.as9105.com. [80.42.66.93]) by smtp.gmail.com with ESMTPSA id s14-20020a170906c30e00b009937e7c4e54sm2859692ejz.39.2023.09.15.13.45.48 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 15 Sep 2023 13:45:48 -0700 (PDT) Message-ID: <41a7534c-566c-2a45-6566-2660225158a9@gmail.com> Date: Fri, 15 Sep 2023 21:45:46 +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 To: "Kevin P. Neal" Cc: FreeBSD questions References: <20230827083631.192eb52f7b99e9ebd6b54ccf@sohara.org> <20230827191324.eb8e546fdfb61469dd14bc5a@sohara.org> <55dc4697-dafe-19fe-0017-20a6effbac2b@gmail.com> <20230827213415.27b35f49feaf6b6959f9df7c@sohara.org> Content-Language: en-US From: Graham Perrin Subject: Re: git-rebase(1) prior to a PR in in the github.com/freebsd area In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Queue-Id: 4RnR6V4zfJz4LDd On 15/09/2023 02:15, Kevin P. Neal wrote: >> … >> >> % 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 > Is that the right date? Good point, thanks. It does precede me taking the hints about additional changes, however I'm inclined to not fix the date in this case (unless it's requested as part of the review). Less noise. > When I squash a branch I never get the right > timestamp. I think it reuses the timestamp from first commit that > is "pick" instead of "squash". But I think "git commit --amend --date=now" > is good enough for me. Or something like that... I don't have my notes > handy.